diff --git a/core/imageboard/image.php b/core/imageboard/image.php
index a6b5b7ff..7e8997cd 100644
--- a/core/imageboard/image.php
+++ b/core/imageboard/image.php
@@ -107,6 +107,7 @@ class Image
     public static function by_hash(string $hash): ?Image
     {
         global $database;
+        $hash = strtolower($hash);
         $row = $database->get_row("SELECT images.* FROM images WHERE hash=:hash", ["hash"=>$hash]);
         return ($row ? new Image($row) : null);
     }
diff --git a/ext/handle_svg/main.php b/ext/handle_svg/main.php
index f8c8bef2..84eb19a6 100644
--- a/ext/handle_svg/main.php
+++ b/ext/handle_svg/main.php
@@ -67,6 +67,10 @@ class SVGFileHandler extends DataHandlerExtension
 
     protected function check_contents(string $file): bool
     {
+        if (getMimeType($file)!="image/svg+xml") {
+            return false;
+        }
+
         $msp = new MiniSVGParser($file);
         return bool_escape($msp->valid);
     }
diff --git a/ext/image/main.php b/ext/image/main.php
index 48b91696..d3b8b725 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -180,11 +180,13 @@ class ImageIO extends Extension
                 throw new ImageReplaceException($error);
             }
 
-            if (strlen(trim($image->source)) == 0) {
+            if (strlen(trim($image->source ?? '')) == 0) {
                 $image->source = $existing->get_source();
             }
 
             // Update the data in the database.
+            $image->id = $id;
+            send_event(new MediaCheckPropertiesEvent($image));
             $image->save_to_db();
 
             /*
diff --git a/themes/lite/themelet.class.php b/themes/lite/themelet.class.php
index 6759ca10..df5561f4 100644
--- a/themes/lite/themelet.class.php
+++ b/themes/lite/themelet.class.php
@@ -72,7 +72,7 @@ class Themelet extends BaseThemelet
 
         $pages = [];
         foreach (range($start, $end) as $i) {
-            $pages[] = $this->litetheme_gen_page_link_block($base_url, $query, $i, $current_page, $i);
+            $pages[] = $this->litetheme_gen_page_link_block($base_url, $query, $i, $current_page, strval($i));
         }
         $pages_html = implode(" ", $pages);