diff --git a/common/rulesys.cpp b/common/rulesys.cpp
index fed83d097..4c6063042 100644
--- a/common/rulesys.cpp
+++ b/common/rulesys.cpp
@@ -274,7 +274,7 @@ bool RuleManager::LoadRules(Database *database, const char *ruleset_name, bool r
 		Log(Logs::Detail, Logs::Rules, "Processing rule set '%s' (%d) load...", default_ruleset_name.c_str(), default_ruleset_id);
 
 		std::string query = StringFormat(
-			"SELECT `rule_name`, `rule_value` FROM `rule_values` WHERE `ruleset_id` = '%d'",
+			"SELECT `rule_name`, `rule_value` FROM `rule_values` WHERE `ruleset_id` = %d",
 			default_ruleset_id
 		);
 
@@ -292,7 +292,7 @@ bool RuleManager::LoadRules(Database *database, const char *ruleset_name, bool r
 
 	Log(Logs::Detail, Logs::Rules, "Processing rule set '%s' (%d) load...", ruleset_name, ruleset_id);
 
-	std::string query = StringFormat("SELECT `rule_name`, `rule_value` FROM `rule_values` WHERE `ruleset_id` = '%d'", ruleset_id);
+	std::string query = StringFormat("SELECT `rule_name`, `rule_value` FROM `rule_values` WHERE `ruleset_id` = %d", ruleset_id);
 
 	auto results = database->QueryDatabase(query);
 	if (!results.Success()) {
diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp
index 7015b042c..ad29b10dc 100755
--- a/zone/zonedb.cpp
+++ b/zone/zonedb.cpp
@@ -4106,7 +4106,7 @@ bool ZoneDatabase::LoadFactionData()
 
 	memset(faction_array, 0, (sizeof(Faction*) * (max_faction + 1)));
 
-	std::vector<size_t> faction_ids;
+	std::vector<std::string> faction_ids;
 
 	// load factions
     query = "SELECT `id`, `name`, `base` FROM `faction_list`";
@@ -4136,12 +4136,12 @@ bool ZoneDatabase::LoadFactionData()
 		faction_array[index]->min = MIN_PERSONAL_FACTION;
 		faction_array[index]->max = MAX_PERSONAL_FACTION;
 
-		faction_ids.push_back(index);
+		faction_ids.push_back(fr_row[0]);
 	}
 
 	LogInfo("[{}] Faction(s) loaded...", faction_ids.size());
 
-	const std::string faction_id_criteria(implode(",", std::pair<char, char>('\'', '\''), faction_ids));
+	const std::string faction_id_criteria(implode(",", faction_ids));
 
 	// load faction mins/maxes
 	query = fmt::format("SELECT `client_faction_id`, `min`, `max` FROM `faction_base_data` WHERE `client_faction_id` IN ({})", faction_id_criteria);