diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php
index 01d10383a2..f95e741b00 100644
--- a/wp-admin/upgrade-functions.php
+++ b/wp-admin/upgrade-functions.php
@@ -414,6 +414,12 @@ function __get_option($setting) {
 
 	$option = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'");
 
+	if ( 'home' == $setting && '' == $value )
+		return __get_option('siteurl');
+
+	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting )
+		$option = preg_replace('|/+$|', '', $option);
+
 	@ $kellogs = unserialize($option);
 	if ($kellogs !== FALSE)
 		return $kellogs;
diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index 7360f62863..63bcf8ff11 100644
--- a/wp-admin/upgrade.php
+++ b/wp-admin/upgrade.php
@@ -74,8 +74,10 @@ switch($step) {
 	break;
 	
 	case 1:
+	wp_cache_flush();
 	make_db_current_silent();
 	upgrade_all();
+	wp_cache_flush();
 ?> 
 <h2><?php _e('Step 1'); ?></h2> 
 	<p><?php printf(__("There's actually only one step. So if you see this, you're done. <a href='%s'>Have fun</a>!"), __get_option('home')); ?></p>