diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index 4cdaff5a11..c933c113b3 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -701,6 +701,7 @@ function user_can_access_admin_page() {
 
 function get_admin_page_title() {
 	global $title;
+	global $menu;
 	global $submenu;
 	global $pagenow;
 	global $plugin_page;
@@ -709,15 +710,30 @@ function get_admin_page_title() {
 		return $title;
 	}
 
-	foreach (array_keys($submenu) as $parent) {
-		foreach ($submenu[$parent] as $submenu_array) {
-			if (isset($submenu_array[3])) {
-				if ($submenu_array[2] == $pagenow) {
-					$title = $submenu_array[3];
-					return $submenu_array[3];
-				} else if (isset($plugin_page) && ($plugin_page == $submenu_array[2])) {
-					$title = $submenu_array[3];
-					return $submenu_array[3];
+	$parent = get_admin_page_parent();
+	if (empty($parent)) {
+		foreach ($menu as $menu_array) {
+			if (isset($menu_array[3])) {
+				if ($menu_array[2] == $pagenow) {
+					$title = $menu_array[3];
+					return $menu_array[3];
+				} else if (isset($plugin_page) && ($plugin_page == $menu_array[2])) {
+					$title = $menu_array[3];
+					return $menu_array[3];
+				}
+			}
+		}
+	} else {
+		foreach (array_keys($submenu) as $parent) {
+			foreach ($submenu[$parent] as $submenu_array) {
+				if (isset($submenu_array[3])) {
+					if ($submenu_array[2] == $pagenow) {
+						$title = $submenu_array[3];
+						return $submenu_array[3];
+					} else if (isset($plugin_page) && ($plugin_page == $submenu_array[2])) {
+						$title = $submenu_array[3];
+						return $submenu_array[3];
+					}
 				}
 			}
 		}
diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php
index d91de742a0..0af6d01ccd 100644
--- a/wp-admin/upgrade-functions.php
+++ b/wp-admin/upgrade-functions.php
@@ -1,6 +1,7 @@
 <?php
 
-require_once(dirname(__FILE__) . '/upgrade-schema.php');
+require_once(ABSPATH . '/wp-admin/admin-functions.php');
+require_once(ABSPATH . '/wp-admin/upgrade-schema.php');
 // Functions to be called in install and upgrade scripts
 function upgrade_all() {
 	populate_options();
@@ -8,6 +9,7 @@ function upgrade_all() {
 	upgrade_101();
 	upgrade_110();
 	upgrade_130();
+	save_mod_rewrite_rules();
 }
 
 function upgrade_100() {
@@ -527,20 +529,6 @@ function make_db_current_silent() {
 	$alterations = dbDelta($wp_queries);
 }
 
-function get_home_path() {
-	$home = get_settings('home');
-	if ( $home != '' && $home != get_settings('siteurl') ) {
-		$home_path = parse_url($home);
-		$home_path = $home_root['path'];
-		$root = str_replace($_SERVER["PHP_SELF"], '', $_SERVER["SCRIPT_FILENAME"]);
-		$home_path = $root . $home_path . "/";
-	} else {
-		$home_path = ABSPATH;
-	}
-
-	return $home_path;
-}
-
 function make_site_theme_from_oldschool($theme_name, $template) {
 	$home_path = get_home_path();
 	$site_dir = ABSPATH . "wp-content/themes/$template";