diff --git a/extensions/clientprefs/extension.cpp b/extensions/clientprefs/extension.cpp
index 14801b34..0aa17c78 100644
--- a/extensions/clientprefs/extension.cpp
+++ b/extensions/clientprefs/extension.cpp
@@ -46,6 +46,7 @@ CookieTypeHandler g_CookieTypeHandler;
 HandleType_t g_CookieIterator = 0;
 CookieIteratorHandler g_CookieIteratorHandler;
 DbDriver g_DriverType;
+static const DatabaseInfo *storage_local = NULL;
 
 bool ClientPrefs::SDK_OnLoad(char *error, size_t maxlength, bool late)
 {
@@ -58,6 +59,20 @@ bool ClientPrefs::SDK_OnLoad(char *error, size_t maxlength, bool late)
 	{
 		DBInfo = dbi->FindDatabaseConf("default");
 
+		if (DBInfo == NULL ||
+			(strcmp(DBInfo->host, "localhost") == 0 &&
+			 strcmp(DBInfo->database, "sourcemod") == 0 && 
+			 strcmp(DBInfo->user, "root") == 0 &&
+			 strcmp(DBInfo->pass, "") == 0 &&
+			 strcmp(DBInfo->driver, "") == 0))
+		{
+			storage_local = dbi->FindDatabaseConf("storage-local");
+			if (DBInfo == NULL)
+			{
+				DBInfo = storage_local;
+			}
+		}
+
 		if (DBInfo == NULL)
 		{
 			snprintf(error, maxlength, "Could not find \"clientprefs\" or \"default\" database configs");
@@ -176,6 +191,14 @@ void ClientPrefs::DatabaseConnect()
 
 	Database = Driver->Connect(DBInfo, true, error, sizeof(error));
 
+	if (Database == NULL &&
+		DBInfo != storage_local &&
+		storage_local != NULL)
+	{
+		DBInfo = storage_local;
+		Database = Driver->Connect(DBInfo, true, error, sizeof(error));
+	}
+
 	if (Database == NULL)
 	{
 		g_pSM->LogError(myself, error);
diff --git a/plugins/basetriggers.sp b/plugins/basetriggers.sp
index f2dc3c45..336aa70d 100644
--- a/plugins/basetriggers.sp
+++ b/plugins/basetriggers.sp
@@ -299,7 +299,7 @@ public Action:Command_Say(client, args)
 		}
 		else
 		{
-			if (mapchooser && !HasEndOfMapVoteFinished())
+			if (mapchooser && EndOfMapVoteEnabled() && !HasEndOfMapVoteFinished())
 			{
 				PrintToChat(client, "[SM] %t", "Pending Vote");			
 			}
diff --git a/plugins/sql-admin-manager.sp b/plugins/sql-admin-manager.sp
index 9b085847..563abfc9 100644
--- a/plugins/sql-admin-manager.sp
+++ b/plugins/sql-admin-manager.sp
@@ -606,7 +606,7 @@ public Action:Command_AddGroup(client, args)
 {
 	if (args < 2)
 	{
-		ReplyToCommand(client, "[SM] Usage: sm_sql_addgroup <flags> <name> [immunity]");
+		ReplyToCommand(client, "[SM] Usage: sm_sql_addgroup <name> <flags> [immunity]");
 		return Plugin_Handled;
 	}
 
@@ -660,8 +660,8 @@ public Action:Command_AddGroup(client, args)
 	Format(query, 
 		sizeof(query),
 		"INSERT INTO sm_groups (flags, name, immunity_level) VALUES ('%s', '%s', '%d')",
-		safe_name,
 		safe_flags,
+		safe_name,
 		immunity);
 	
 	if (!SQL_FastQuery(db, query))