diff --git a/phpBB/install/schemas/mysql_basic.sql b/phpBB/install/schemas/mysql_basic.sql
index 17b0ea8961..a097af29d9 100644
--- a/phpBB/install/schemas/mysql_basic.sql
+++ b/phpBB/install/schemas/mysql_basic.sql
@@ -92,6 +92,7 @@ INSERT INTO phpbb_auth_options (auth_value, is_local) VALUES ('f_list', 1);
 INSERT INTO phpbb_auth_options (auth_value, is_local) VALUES ('f_read', 1);
 INSERT INTO phpbb_auth_options (auth_value, is_local) VALUES ('f_post', 1);
 INSERT INTO phpbb_auth_options (auth_value, is_local) VALUES ('f_reply', 1);
+INSERT INTO phpbb_auth_options (auth_value, is_local) VALUES ('f_quote', 1);
 INSERT INTO phpbb_auth_options (auth_value, is_local) VALUES ('f_edit', 1);
 INSERT INTO phpbb_auth_options (auth_value, is_local) VALUES ('f_delete', 1);
 INSERT INTO phpbb_auth_options (auth_value, is_local) VALUES ('f_poll', 1);
@@ -125,8 +126,7 @@ INSERT INTO phpbb_auth_options (auth_value, is_local, is_global) VALUES ('m_unra
 INSERT INTO phpbb_auth_options (auth_value, is_local, is_global) VALUES ('m_auth', 1, 1);
 
 INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_', 1);
-INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_confserver', 1);
-INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_confdefaults', 1);
+INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_general', 1);
 INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_user', 1);
 INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_useradd', 1);
 INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_userdel', 1);
@@ -139,7 +139,7 @@ INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_forumadd', 1);
 INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_forumdel', 1);
 INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_posts', 1);
 INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_ban', 1);
-INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_authforums', 1);
+INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_auth', 1);
 INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_authmods', 1);
 INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_authadmins', 1);
 INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('a_email', 1);
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index 82f19af51b..9c2363f3d4 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -87,7 +87,7 @@ CREATE TABLE phpbb_banlist (
 CREATE TABLE phpbb_config (
     config_name varchar(255) NOT NULL,
     config_value varchar(255) NOT NULL,
-    is_dynamic DEFAULT '0' NOT NULL,
+    is_dynamic tinyint(1) DEFAULT '0' NOT NULL,
     PRIMARY KEY (config_name),
     KEY is_dynamic (is_dynamic)
 );
@@ -246,7 +246,7 @@ CREATE TABLE phpbb_poll_voters (
   poll_option_id tinyint(4) UNSIGNED NOT NULL DEFAULT '0',
   vote_user_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
   vote_user_ip varchar(40) NOT NULL,
-  KEY topic_id (vote_id),
+  KEY topic_id (topic_id),
   KEY vote_user_id (vote_user_id),
   KEY vote_user_ip (vote_user_ip)
 );