diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php
index 439b5ccd9e..e14e2d27d2 100644
--- a/main/inc/lib/add_course.lib.inc.php
+++ b/main/inc/lib/add_course.lib.inc.php
@@ -498,7 +498,7 @@ function update_Db_course($courseDbName)
 		) TYPE=MyISAM";
 
 	api_sql_query($sql, __FILE__, __LINE__);
-	$sql = "ALTER TABLE `".$TABLETOOLFORUMTHREAD . "` ADD INDEX (forum_id)";
+	$sql = "ALTER TABLE `".$TABLETOOLFORUMTHREAD . "` ADD INDEX idx_forum_thread_forum_id (forum_id)";
 	api_sql_query($sql, __FILE__, __LINE__);
 	
 	// Forum Posts
@@ -521,6 +521,10 @@ function update_Db_course($courseDbName)
 		) TYPE=MyISAM";
 
 	api_sql_query($sql, __FILE__, __LINE__);
+	$sql = "ALTER TABLE `".$TABLETOOLFORUMPOST . "` ADD INDEX idx_forum_post_thread_id (thread_id)";
+	api_sql_query($sql, __FILE__, __LINE__);
+	$sql = "ALTER TABLE `".$TABLETOOLFORUMPOST . "` ADD INDEX idx_forum_post_visible (visible)";
+	api_sql_query($sql, __FILE__, __LINE__);
 
 	// Forum Mailcue
 	$sql = "
@@ -806,7 +810,7 @@ function update_Db_course($courseDbName)
 		start_visible datetime NOT NULL default '0000-00-00 00:00:00',
 		end_visible datetime NOT NULL default '0000-00-00 00:00:00'
 		) TYPE=MyISAM;");
-	api_sql_query("ALTER TABLE `$TABLEITEMPROPERTY` ADD INDEX (tool,ref)");
+	api_sql_query("ALTER TABLE `$TABLEITEMPROPERTY` ADD INDEX idx_item_property_toolref (tool,ref)");
 
 	/*
 	-----------------------------------------------------------
diff --git a/main/install/migrate-db-1.8.4-1.8.5-pre.sql b/main/install/migrate-db-1.8.4-1.8.5-pre.sql
index 007b568881..ec2cdf0660 100644
--- a/main/install/migrate-db-1.8.4-1.8.5-pre.sql
+++ b/main/install/migrate-db-1.8.4-1.8.5-pre.sql
@@ -94,7 +94,11 @@ ALTER TABLE dropbox_post ADD session_id SMALLINT UNSIGNED NOT NULL ;
 ALTER TABLE dropbox_post ADD INDEX ( session_id ) ;
 ALTER TABLE dropbox_file ADD session_id SMALLINT UNSIGNED NOT NULL ;
 ALTER TABLE dropbox_file ADD INDEX ( session_id ) ;
-ALTER TABLE item_property ADD INDEX (tool,ref);
+ALTER TABLE item_property ADD INDEX idx_item_property_toolref (tool,ref);
 ALTER TABLE forum_forum ADD session_id SMALLINT UNSIGNED  DEFAULT 0 ;
 INSERT INTO course_setting(variable,value,category) VALUES ('allow_user_image_forum',1,'forum');
 INSERT INTO course_setting(variable,value,category) VALUES ('course_theme','','theme');
+INSERT INTO course_setting(variable,value,category) VALUES ('allow_learning_path_theme','1','theme');
+ALTER TABLE forum_post ADD INDEX idx_forum_post_thread_id (thread_id);
+ALTER TABLE forum_post ADD INDEX idx_forum_post_visible (visible);
+ALTER TABLE forum_thread ADD INDEX idx_forum_thread_forum_id (forum_id);
\ No newline at end of file