diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index 66c0a08d8b..1efeadb111 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -345,6 +345,7 @@ class ...
 				<li><code>/includes/db/sqlite.php</code><br />Sqlite Database Abstraction Layer</li>
 			</ul>
 		</li>
+		<li><b>diff</b><br /><code>/includes/diff</code><br />Diff Engine</li>
 		<li><b>docs</b><br /><code>/docs</code><br />phpBB Documentation</li>
 		<li><b>images</b><br /><code>/images</code><br />All global images not connected to styles</li>
 		<li><b>install</b><br /><code>/install</code><br />Installation System</li>
@@ -353,6 +354,7 @@ class ...
 		<li><b>VC</b><br /><code>/includes/captcha</code><br />CAPTCHA</li>
 		<li><b>mcp</b><br /><code>mcp.php</code>, <code>/includes/mcp</code>, <code>report.php</code><br />Moderator Control Panel</li>
 		<li><b>ucp</b><br /><code>ucp.php</code>, <code>/includes/ucp</code><br />User Control Panel</li>
+		<li><b>utf</b><br /><code>/includes/utf</code><br />UTF8-related functions/classes</li>
 		<li><b>search</b><br /><code>/includes/search</code>, <code>search.php</code><br />Search System</li>
 		<li><b>styles</b><br /><code>/styles</code>, <code>style.php</code><br />phpBB Styles/Templates/Themes/Imagesets</li>
 	</ul>
diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index 290142103f..d3014f0e13 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -43,7 +43,28 @@ class dbal_mssql_odbc extends dbal
 		$this->server = $sqlserver . (($port) ? ':' . $port : '');
 		$this->dbname = $database;
 
-		@ini_set('odbc.defaultlrl', 65536);
+		$max_size = @ini_get('odbc.defaultlrl');
+		if (!empty($max_size))
+		{
+			$unit = strtolower(substr($max_size, -1, 1));
+			$max_size = (int) $max_size;
+
+			if ($unit == 'k')
+			{
+				$max_size = floor($max_size / 1024);
+			}
+			else if ($unit == 'g')
+			{
+				$max_size *= 1024;
+			}
+			else if (is_numeric($unit))
+			{
+				$max_size = floor((int) ($max_size . $unit) / 1048576);
+			}
+			$max_size = max(8, $max_size) . 'M';
+
+			@ini_set('odbc.defaultlrl', $max_size);
+		}
 
 		$this->db_connect_id = ($this->persistency) ? @odbc_pconnect($this->server, $this->user, $sqlpassword) : @odbc_connect($this->server, $this->user, $sqlpassword);
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 7b0f120577..56da3590ff 100755
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -109,9 +109,10 @@ if (!empty($mem_limit))
 {
 	$unit = strtolower(substr($mem_limit, -1, 1));
 	$mem_limit = (int) $mem_limit;
+
 	if ($unit == 'k')
 	{
-		$mem_limit = floor($mem_limit/1024);
+		$mem_limit = floor($mem_limit / 1024);
 	}
 	else if ($unit == 'g')
 	{
@@ -119,7 +120,7 @@ if (!empty($mem_limit))
 	}
 	else if (is_numeric($unit))
 	{
-		$mem_limit = floor($mem_limit/1048576);
+		$mem_limit = floor((int) ($mem_limit . $unit) / 1048576);
 	}
 	$mem_limit = max(128, $mem_limit) . 'M';
 }