diff --git a/phpBB/includes/sessions.php b/phpBB/includes/sessions.php
index 2db18c751d..23c05d4e12 100644
--- a/phpBB/includes/sessions.php
+++ b/phpBB/includes/sessions.php
@@ -329,6 +329,8 @@ function session_end($session_id, $user_id)
 	$cookiedomain = $board_config['cookie_domain'];
 	$cookiesecure = $board_config['cookie_secure'];
 
+	$current_time = time();
+
 	//
 	// Pull cookiedata or grab the URI propagated sid
 	//
diff --git a/phpBB/includes/usercp_register.php b/phpBB/includes/usercp_register.php
index 642f5471d4..06cc704097 100644
--- a/phpBB/includes/usercp_register.php
+++ b/phpBB/includes/usercp_register.php
@@ -209,7 +209,7 @@ if (
 // and ensure that they were trying to register a second time
 // (Prevents double registrations)
 //
-if ( $userdata['session_logged_in'] && $mode =="register" && $username == $userdata['username'])
+if ( $userdata['session_logged_in'] && $mode == 'register' && $username == $userdata['username'])
 {
 	message_die(GENERAL_MESSAGE, $lang['Username_taken'], '', __LINE__, __FILE__);
 }
diff --git a/phpBB/install/upgrade.php b/phpBB/install/upgrade.php
index a607fb7e99..9fdcc9e393 100644
--- a/phpBB/install/upgrade.php
+++ b/phpBB/install/upgrade.php
@@ -194,7 +194,7 @@ function get_schema()
 {
 	global $table_prefix;
 
-	$schemafile = file('db/schemas/mysql_schema.sql');
+	$schemafile = file('schemas/mysql_schema.sql');
 	$tabledata = 0;
 
 	for($i=0; $i < count($schemafile); $i++)
@@ -280,7 +280,7 @@ function get_inserts()
 {
 	global $table_prefix;
 
-	$insertfile = file('db/schemas/mysql_basic.sql');
+	$insertfile = file('schemas/mysql_basic.sql');
 
 	for($i = 0; $i < count($insertfile); $i++)
 	{
@@ -1936,8 +1936,8 @@ if ( !empty($next) )
 	}
 }
 
-print "<br />If the upgrade completed without error you may click <a href=\"index.$phpEx\">Here</a> to proceed to the index<br />";
+print "<br />If the upgrade completed without error you may click <a href=\"./../index.$phpEx\">Here</a> to proceed to the index<br />";
 
 common_footer();
 
-?>
+?>
\ No newline at end of file