diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 0feaeff08e..30d14c985b 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -463,7 +463,6 @@ function connect_check_db($error_connect, &$error, $dbms, $table_prefix, $dbhost
 			break;
 		}
 
-		$db->sql_close();
 	}
 
 	if ($error_connect && (!isset($error) || !sizeof($error)))
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 8ba43f4be8..f87bf2f7d6 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -431,7 +431,7 @@ if (!$get_info)
 				'autoincrement'	=> 'rank_id',
 
 				array('rank_id',					'ranks.rank_id',				''),
-				array('rank_title',					'ranks.rank_title',				array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')),
+				array('rank_title',					'ranks.rank_title',				array('function1' => 'phpbb_set_default_encoding', 'function2' => 'utf8_htmlspecialchars')),
 				array('rank_min',					'ranks.rank_min',				array('typecast' => 'int', 'execute' => '{RESULT} = ({VALUE}[0] < 0) ? 0 : {VALUE}[0];')),
 				array('rank_special',				'ranks.rank_special',			''),
 				array('rank_image',					'ranks.rank_image',				'import_rank'),
@@ -615,7 +615,7 @@ if (!$get_info)
 			array(
 				'target'		=> PRIVMSGS_TABLE,
 				'primary'		=> 'privmsgs.privmsgs_id',
-				'autoincrement'	=> 'privmsgs_id',
+				'autoincrement'	=> 'msg_id',
 				'query_first'	=> array(
 					array('target', $convert->truncate_statement . PRIVMSGS_TABLE),
 					array('target', $convert->truncate_statement . PRIVMSGS_RULES_TABLE),
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index 28093f8efa..9b7e621397 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -279,7 +279,7 @@ class install_convert extends module
 
 		while ($entry = readdir($handle))
 		{
-			if (preg_match('/^convert_([a-z0-9_]+).' . $phpEx . '/i', $entry, $m))
+			if (preg_match('/^convert_([a-z0-9_]+).' . $phpEx . '$/i', $entry, $m))
 			{
 				include('./convertors/' . $entry);
 				if (isset($convertor_data))
@@ -452,6 +452,7 @@ class install_convert extends module
 				if (!$result)
 				{
 					$prefixes = array();
+					// TODO: fixme
 					if ($result = $src_db->sql_query('SHOW TABLES'))
 					{
 						while ($row = $src_db->sql_fetchrow($result))
@@ -991,7 +992,7 @@ class install_convert extends module
 				$config['max_quote_depth'] = 0;
 
 				// @todo Need to confirm that max post length in source is <= max post length in destination or there may be interesting formatting issues
-				$config['max_post_chars'] = -1; 
+				$config['max_post_chars'] = -1;
 			}
 
 			$template->assign_block_vars('checks', array(