diff --git a/common/zone_store.cpp b/common/zone_store.cpp
index 3e0e3ba18..7bcb2cb6f 100644
--- a/common/zone_store.cpp
+++ b/common/zone_store.cpp
@@ -370,7 +370,7 @@ uint32 ZoneStore::GetZoneRuleSet(uint32 zone_id, int version)
 	return 0;
 }
 
-const std::string& ZoneStore::GetZoneNote(uint32 zone_id, int version)
+const std::string ZoneStore::GetZoneNote(uint32 zone_id, int version)
 {
 	for (auto &z: m_zones) {
 		if (z.zoneidnumber == zone_id && z.version == version) {
@@ -384,8 +384,7 @@ const std::string& ZoneStore::GetZoneNote(uint32 zone_id, int version)
 		}
 	}
 
-	const auto& note = std::string();
-	return note;
+	return "";
 }
 
 float ZoneStore::GetZoneUnderworld(uint32 zone_id, int version)
@@ -736,7 +735,7 @@ float ZoneStore::GetZoneFogDensity(uint32 zone_id, int version)
 	return 0.0f;
 }
 
-const std::string& ZoneStore::GetZoneFlagNeeded(uint32 zone_id, int version)
+const std::string ZoneStore::GetZoneFlagNeeded(uint32 zone_id, int version)
 {
 	for (auto &z: m_zones) {
 		if (z.zoneidnumber == zone_id && z.version == version) {
@@ -750,8 +749,7 @@ const std::string& ZoneStore::GetZoneFlagNeeded(uint32 zone_id, int version)
 		}
 	}
 
-	const auto& flag_needed = std::string();
-	return flag_needed;
+	return "";
 }
 
 int8 ZoneStore::GetZoneCanBind(uint32 zone_id, int version)
@@ -1259,7 +1257,7 @@ int8 ZoneStore::GetZoneMaximumExpansion(uint32 zone_id, int version)
 	return DEFAULT_ZONE_MIN_MAX_EXPANSION;
 }
 
-const std::string& ZoneStore::GetZoneContentFlags(uint32 zone_id, int version)
+const std::string ZoneStore::GetZoneContentFlags(uint32 zone_id, int version)
 {
 	for (auto &z: m_zones) {
 		if (z.zoneidnumber == zone_id && z.version == version) {
@@ -1271,13 +1269,12 @@ const std::string& ZoneStore::GetZoneContentFlags(uint32 zone_id, int version)
 		if (z.zoneidnumber == zone_id && z.version == 0) {
 			return z.content_flags;
 		}
-	}
+	};
 
-	const auto& content_flags = std::string();
-	return content_flags;
+	return "";
 }
 
-const std::string& ZoneStore::GetZoneContentFlagsDisabled(uint32 zone_id, int version)
+const std::string ZoneStore::GetZoneContentFlagsDisabled(uint32 zone_id, int version)
 {
 	for (auto &z: m_zones) {
 		if (z.zoneidnumber == zone_id && z.version == version) {
@@ -1291,8 +1288,7 @@ const std::string& ZoneStore::GetZoneContentFlagsDisabled(uint32 zone_id, int ve
 		}
 	}
 
-	const auto& content_flags_disabled = std::string();
-	return content_flags_disabled;
+	return "";
 }
 
 int ZoneStore::GetZoneUnderworldTeleportIndex(uint32 zone_id, int version)
diff --git a/common/zone_store.h b/common/zone_store.h
index d1b72a802..bc245643a 100644
--- a/common/zone_store.h
+++ b/common/zone_store.h
@@ -54,7 +54,7 @@ public:
 	int GetZoneTimeZone(uint32 zone_id, int version = 0);
 	int GetZoneMaximumPlayers(uint32 zone_id, int version = 0);
 	uint32 GetZoneRuleSet(uint32 zone_id, int version = 0);
-	const std::string& GetZoneNote(uint32 zone_id, int version = 0);
+	const std::string GetZoneNote(uint32 zone_id, int version = 0);
 	float GetZoneUnderworld(uint32 zone_id, int version = 0);
 	float GetZoneMinimumClip(uint32 zone_id, int version = 0);
 	float GetZoneMaximumClip(uint32 zone_id, int version = 0);
@@ -69,7 +69,7 @@ public:
 	float GetZoneWalkSpeed(uint32 zone_id, int version = 0);
 	uint8 GetZoneTimeType(uint32 zone_id, int version = 0);
 	float GetZoneFogDensity(uint32 zone_id, int version = 0);
-	const std::string& GetZoneFlagNeeded(uint32 zone_id, int version = 0);
+	const std::string GetZoneFlagNeeded(uint32 zone_id, int version = 0);
 	int8 GetZoneCanBind(uint32 zone_id, int version = 0);
 	int8 GetZoneCanCombat(uint32 zone_id, int version = 0);
 	int8 GetZoneCanLevitate(uint32 zone_id, int version = 0);
@@ -95,8 +95,8 @@ public:
 	uint32 GetZoneMaximumMovementUpdateRange(uint32 zone_id, int version = 0);
 	int8 GetZoneMinimumExpansion(uint32 zone_id, int version = 0);
 	int8 GetZoneMaximumExpansion(uint32 zone_id, int version = 0);
-	const std::string& GetZoneContentFlags(uint32 zone_id, int version = 0);
-	const std::string& GetZoneContentFlagsDisabled(uint32 zone_id, int version = 0);
+	const std::string GetZoneContentFlags(uint32 zone_id, int version = 0);
+	const std::string GetZoneContentFlagsDisabled(uint32 zone_id, int version = 0);
 	int GetZoneUnderworldTeleportIndex(uint32 zone_id, int version = 0);
 	int GetZoneLavaDamage(uint32 zone_id, int version = 0);
 	int GetZoneMinimumLavaDamage(uint32 zone_id, int version = 0);