diff --git a/UPDATE_SCRIPT__ARCHIVING_OF_THREADS.php b/UPDATE_SCRIPT__ARCHIVING_OF_THREADS.php
index 83f13819..891f0eba 100644
--- a/UPDATE_SCRIPT__ARCHIVING_OF_THREADS.php
+++ b/UPDATE_SCRIPT__ARCHIVING_OF_THREADS.php
@@ -16,6 +16,9 @@ if (!$mod || $mod['type'] != ADMIN)
 
 
 
+// Set timelimit to what it is for rebuild
+@set_time_limit($config['mod']['rebuild_timelimit']);
+
 
 $page['title'] = 'Updating Database - Archiving of Threads';
 
diff --git a/UPDATE_SCRIPT__HASHING_OF_IP_ADDRESSES.php b/UPDATE_SCRIPT__HASHING_OF_IP_ADDRESSES.php
index f2fd152a..d911a5ee 100644
--- a/UPDATE_SCRIPT__HASHING_OF_IP_ADDRESSES.php
+++ b/UPDATE_SCRIPT__HASHING_OF_IP_ADDRESSES.php
@@ -16,6 +16,9 @@ if (!$mod || $mod['type'] != ADMIN)
 
 
 
+// Set timelimit to what it is for rebuild
+@set_time_limit($config['mod']['rebuild_timelimit']);
+
 
 $page['title'] = 'Updating Database Hashing IP';
 
diff --git a/UPDATE_SCRIPT__SHADOW_DELETE.php b/UPDATE_SCRIPT__SHADOW_DELETE.php
index a08fce66..2bc8fdd4 100644
--- a/UPDATE_SCRIPT__SHADOW_DELETE.php
+++ b/UPDATE_SCRIPT__SHADOW_DELETE.php
@@ -14,6 +14,8 @@ check_login(true);
 if (!$mod || $mod['type'] != ADMIN)
     die("You need to be logged in as admin");
 
+// Set timelimit to what it is for rebuild
+@set_time_limit($config['mod']['rebuild_timelimit']);
 
 $page['title'] = 'Updating Database - Temporarly Deletion of Threads';
 
@@ -38,13 +40,6 @@ switch($step)
 		$boards = listBoards();
 		foreach ($boards as &$_board) {
 
-			
-			// Create Temp Posts Table for Boards
-			$query = Element('../UPDATE_SQL__SHADOW_DELETE.sql');
-			if (mysql_version() < 50503)
-				$query = preg_replace('/(CHARSET=|CHARACTER SET )utf8mb4/', '$1utf8', $query);
-			query($query) or $sql_errors .= "<li>Add Shared Shadow Post DB Tables<br/>" . db_error() . '</li>';
-
 			// Create Temp Posts Table for Boards
 			$query = Element('posts.sql', array('board' => $_board['uri']));
 			$query = str_replace("``posts_", "``shadow_posts_", $query);
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 2ba6af19..572f3a48 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -3011,6 +3011,7 @@ function mod_rebuild() {
 			$config['try_smarter'] = false;
 			
 			if (isset($_POST['rebuild_index'])) {
+				clean("Rebuild");
 				buildIndex();
 				$log[] = '<strong>' . sprintf($config['board_abbreviation'], $board['uri']) . '</strong>: Creating index pages';
 			}