diff --git a/zone/client.cpp b/zone/client.cpp
index 1836e54bb..1c0226c40 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -7851,10 +7851,11 @@ void Client::SetFactionLevel(uint32 char_id, uint32 npc_id, uint8 char_class, ui
 	int32 current_value;
 
 	// Get the npc faction list
-	if (!database.GetNPCFactionList(npc_id, faction_id, npc_value, temp))
+	if (!content_db.GetNPCFactionList(npc_id, faction_id, npc_value, temp)) {
 		return;
-	for (int i = 0; i < MAX_NPC_FACTIONS; i++)
-	{
+	}
+
+	for (int i = 0; i < MAX_NPC_FACTIONS; i++) {
 		int32 faction_before_hit;
 		int32 faction_to_use_for_messaging;
 		FactionMods fm;
diff --git a/zone/npc.cpp b/zone/npc.cpp
index aef8d5fac..44cdd1344 100644
--- a/zone/npc.cpp
+++ b/zone/npc.cpp
@@ -3195,7 +3195,7 @@ void NPC::AIYellForHelp(Mob *sender, Mob *attacker)
 			if (mob->GetLevel() >= 50 || attacker->GetLevelCon(mob->GetLevel()) != CON_GRAY) {
 				bool use_primary_faction = false;
 				if (mob->GetPrimaryFaction() == sender->CastToNPC()->GetPrimaryFaction()) {
-					const NPCFactionList *cf = database.GetNPCFactionEntry(mob->CastToNPC()->GetNPCFactionID());
+					const NPCFactionList *cf = content_db.GetNPCFactionEntry(mob->CastToNPC()->GetNPCFactionID());
 					if (cf) {
 						if (cf->assistprimaryfaction != 0) {
 							use_primary_faction = true;