diff --git a/binaries/data/mods/public/gui/session/messages.js b/binaries/data/mods/public/gui/session/messages.js
index fd5c64b355..b005cd81e9 100644
--- a/binaries/data/mods/public/gui/session/messages.js
+++ b/binaries/data/mods/public/gui/session/messages.js
@@ -814,7 +814,7 @@ function parseChatAddressee(msg)
 
 	// For observers only permit public- and observer-chat and PM to observers
 	if (isPlayerObserver(senderID) &&
-			(isPM && !isPlayerObserver(addresseeIndex) || !isPM && cmd != "/observers"))
+		((isPM && !isPlayerObserver(addresseeIndex)) || (!isPM && cmd != "/observers")))
 		return false;
 
 	return isSender || g_IsChatAddressee[cmd](senderID, addresseeGUID);
diff --git a/binaries/data/mods/public/simulation/components/Cost.js b/binaries/data/mods/public/simulation/components/Cost.js
index 3272e661b1..e5660ee4e1 100644
--- a/binaries/data/mods/public/simulation/components/Cost.js
+++ b/binaries/data/mods/public/simulation/components/Cost.js
@@ -56,14 +56,11 @@ Cost.prototype.GetBuildTime = function()
 
 Cost.prototype.GetResourceCosts = function(owner)
 {
-	if (owner == undefined)
+	if (!owner)
 	{
 		let cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
 		if (!cmpOwnership)
-		{
-			warn("GetResourceCost called without valid ownership");
-			owner = 0;
-		}
+			error("GetResourceCost called without valid ownership");
 		else
 			owner = cmpOwnership.GetOwner();
 	}
diff --git a/binaries/data/mods/public/simulation/components/Foundation.js b/binaries/data/mods/public/simulation/components/Foundation.js
index 20cd47bdd5..ab009891d7 100644
--- a/binaries/data/mods/public/simulation/components/Foundation.js
+++ b/binaries/data/mods/public/simulation/components/Foundation.js
@@ -26,7 +26,7 @@ Foundation.prototype.InitialiseConstruction = function(owner, template)
 	// decoupled from its owner, so we need to remember it in here (and assume it won't change)
 	this.owner = owner;
 
-	// Remember our cost here, so if it changes after construction begins (from aura or technologies)
+	// Remember the cost here, so if it changes after construction begins (from auras or technologies)
 	// we will use the correct values to refund partial construction costs
 	let cmpCost = Engine.QueryInterface(this.entity, IID_Cost);
 	this.costs = cmpCost.GetResourceCosts(owner);
diff --git a/source/gui/scripting/ScriptFunctions.cpp b/source/gui/scripting/ScriptFunctions.cpp
index 1f3bc9f9cc..9bac3687ef 100644
--- a/source/gui/scripting/ScriptFunctions.cpp
+++ b/source/gui/scripting/ScriptFunctions.cpp
@@ -384,7 +384,7 @@ void DisconnectNetworkGame(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
 std::string GetPlayerGUID(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
 {
 	if (!g_NetClient)
-		return "";
+		return std::string();
 
 	return g_NetClient->GetGUID();
 }
diff --git a/source/simulation2/helpers/HierarchicalPathfinder.cpp b/source/simulation2/helpers/HierarchicalPathfinder.cpp
index 74c13343da..cbdbe9d429 100644
--- a/source/simulation2/helpers/HierarchicalPathfinder.cpp
+++ b/source/simulation2/helpers/HierarchicalPathfinder.cpp
@@ -112,7 +112,7 @@ void HierarchicalPathfinder::Chunk::InitRegions(int ci, int cj, Grid<NavcellData
 
 	// Directly point the root ID
 	m_NumRegions = 0;
-	for (u16 i = 1; i <= regionID; ++i)
+	for (u16 i = 1; i < regionID+1; ++i)
 	{
 		if (connect[i] == i)
 			++m_NumRegions;