diff --git a/phpBB/includes/acm/acm_db.php b/phpBB/includes/acm/acm_db.php
index ca17abe63a..28df2e62be 100644
--- a/phpBB/includes/acm/acm_db.php
+++ b/phpBB/includes/acm/acm_db.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                               acm_db.php
+ *                                acm_db.php
  *                            -------------------
  *   begin                : Saturday, Feb 13, 2001
  *   copyright            : (C) 2001 The phpBB Group
diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php
index 46c2164f78..e778000a37 100644
--- a/phpBB/includes/acm/acm_file.php
+++ b/phpBB/includes/acm/acm_file.php
@@ -64,6 +64,8 @@ class acm
 			@flock($fp, LOCK_UN);
 			fclose($fp);
 		}
+
+		$this->is_modified = FALSE;
 	}
 
 	function tidy($max_age = 0)
@@ -83,6 +85,7 @@ class acm
 				unlink($this->cache_dir . $entry);
 			}
 		}
+		@closedir($dir);
 
 		if (file_exists($this->cache_dir . 'data_global.' . $phpEx))
 		{