diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 8add2c8938..01044e63eb 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -354,7 +354,7 @@ foreach ($supported_dbms as $dbms)
 			{
 				$orig_column_type = $column_data[0];
 				$column_type = $dbms_type_map[$dbms][$column_data[0]];
-				if ($column_type == 'text')
+				if ($column_type == 'text' || $column_type == 'blob')
 				{
 					$modded_array[$column_name] = $column_type;
 				}
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 707f87c145..50b980df89 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -639,7 +639,7 @@ CREATE TABLE phpbb_search_wordlist (
 	word_text blob NOT NULL,
 	word_common tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	PRIMARY KEY (word_id),
-	UNIQUE wrd_txt (word_text)
+	UNIQUE wrd_txt (word_text(255))
 );
 
 
@@ -1037,7 +1037,7 @@ CREATE TABLE phpbb_users (
 	KEY user_birthday (user_birthday),
 	KEY user_email_hash (user_email_hash),
 	KEY user_type (user_type),
-	UNIQUE username_clean (username_clean)
+	UNIQUE username_clean (username_clean(255))
 );