diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index 3177e7eb4a..3baed177c7 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -145,7 +145,7 @@ static function stats() {
       ->join("exif_records", "items.id", "exif_records.item_id", "left")
       ->where("type", "=", "photo")
       ->and_open()
-      ->where("exif_records.item_id", "=", null)
+      ->where("exif_records.item_id", "IS", null)
       ->or_where("exif_records.dirty", "=", 1)
       ->close()
       ->execute()
diff --git a/modules/exif/helpers/exif_task.php b/modules/exif/helpers/exif_task.php
index e25e24056e..2735264329 100644
--- a/modules/exif/helpers/exif_task.php
+++ b/modules/exif/helpers/exif_task.php
@@ -47,7 +47,7 @@ static function update_index($task) {
                ->join("exif_records", "items.id", "exif_records.item_id", "left")
                ->where("type", "=", "photo")
                ->and_open()
-               ->where("exif_records.item_id", "=", null)
+               ->where("exif_records.item_id", "IS", null)
                ->or_where("exif_records.dirty", "=", 1)
                ->close()
                ->find_all() as $item) {
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index 9123df09f9..70a392721d 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -73,15 +73,13 @@ static function update($item) {
 
   static function stats() {
     $remaining = db::build()
-      ->select("items.id")
       ->from("items")
       ->join("search_records", "items.id", "search_records.item_id", "left")
       ->and_open()
-      ->where("search_records.item_id", "=", null)
+      ->where("search_records.item_id", "IS", null)
       ->or_where("search_records.dirty", "=", 1)
       ->close()
-      ->execute()
-      ->count();
+      ->count_records();
 
     $total = ORM::factory("item")->count_all();
     $percent = round(100 * ($total - $remaining) / $total);
diff --git a/modules/search/helpers/search_task.php b/modules/search/helpers/search_task.php
index 6aa4a0d14d..e039e49373 100644
--- a/modules/search/helpers/search_task.php
+++ b/modules/search/helpers/search_task.php
@@ -45,7 +45,7 @@ static function update_index($task) {
       $start = microtime(true);
       foreach (ORM::factory("item")
                ->join("search_records", "items.id", "search_records.item_id", "left")
-               ->where("search_records.item_id", "=", null)
+               ->where("search_records.item_id", "IS", null)
                ->or_where("search_records.dirty", "=", 1)
                ->find_all() as $item) {
         // The query above can take a long time, so start the timer after its done
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 3c3a6c2ba1..78e1620cdb 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -198,7 +198,7 @@ static function add($task) {
       // they're done.
       $entries = ORM::factory("server_add_file")
         ->where("task_id", "=", $task->id)
-        ->where("item_id", "=", null)
+        ->where("item_id", "IS", null)
         ->order_by("id", "ASC")
         ->limit(10)
         ->find_all();