diff --git a/src/Site/Site.py b/src/Site/Site.py
index d5106397..d856f374 100644
--- a/src/Site/Site.py
+++ b/src/Site/Site.py
@@ -335,7 +335,7 @@ class Site(object):
         queried = self.checkModifications()
 
         if check_files:
-            self.storage.checkFiles(quick_check=True)  # Quick check and mark bad files based on file size
+            self.storage.updateBadFiles(quick_check=True)  # Quick check and mark bad files based on file size
 
         changed, deleted = self.content_manager.loadContent("content.json", load_includes=False)
 
diff --git a/src/Site/SiteStorage.py b/src/Site/SiteStorage.py
index b4fea010..76fa2a73 100644
--- a/src/Site/SiteStorage.py
+++ b/src/Site/SiteStorage.py
@@ -363,7 +363,7 @@ class SiteStorage(object):
         return bad_files
 
     # Check and try to fix site files integrity
-    def checkFiles(self, quick_check=True):
+    def updateBadFiles(self, quick_check=True):
         s = time.time()
         bad_files = self.verifyFiles(
             quick_check,
@@ -380,7 +380,8 @@ class SiteStorage(object):
     def deleteFiles(self):
         self.log.debug("Deleting files from content.json...")
         files = []  # Get filenames
-        for content_inner_path, content in self.site.content_manager.contents.iteritems():
+        for content_inner_path in self.site.content_manager.contents.keys():
+            content = self.site.content_manager.contents[content_inner_path]
             files.append(content_inner_path)
             # Add normal files
             for file_relative_path in content.get("files", {}).keys():