diff --git a/dGame/TradingManager.cpp b/dGame/TradingManager.cpp
index d0ec08d8..0963aa6f 100644
--- a/dGame/TradingManager.cpp
+++ b/dGame/TradingManager.cpp
@@ -60,7 +60,7 @@ void Trade::SetCoins(LWOOBJID participant, uint64_t coins)
     {
         m_CoinsA = coins;
     }
-    else if (participant = m_ParticipantB)
+    else if (participant == m_ParticipantB)
     {
         m_CoinsB = coins;
     }
@@ -72,7 +72,7 @@ void Trade::SetItems(LWOOBJID participant, std::vector<TradeItem> items)
     {
         m_ItemsA = items;
     }
-    else if (participant = m_ParticipantB)
+    else if (participant == m_ParticipantB)
     {
         m_ItemsB = items;
     }
diff --git a/dGame/dComponents/BuffComponent.h b/dGame/dComponents/BuffComponent.h
index 68cd5309..ba22c08b 100644
--- a/dGame/dComponents/BuffComponent.h
+++ b/dGame/dComponents/BuffComponent.h
@@ -51,7 +51,7 @@ public:
 
     void LoadFromXML(tinyxml2::XMLDocument* doc);
 
-    void UpdateXml(tinyxml2::XMLDocument* doc);
+    void UpdateXml(tinyxml2::XMLDocument* doc) override;
     
     void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags);
 
diff --git a/dGame/dComponents/ControllablePhysicsComponent.h b/dGame/dComponents/ControllablePhysicsComponent.h
index 1c1a4f44..f0fe7461 100644
--- a/dGame/dComponents/ControllablePhysicsComponent.h
+++ b/dGame/dComponents/ControllablePhysicsComponent.h
@@ -23,7 +23,7 @@ public:
     ControllablePhysicsComponent(Entity* entity);
     ~ControllablePhysicsComponent() override;
     
-    void Update(float deltaTime);
+    void Update(float deltaTime) override;
     void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags);
     void LoadFromXML(tinyxml2::XMLDocument* doc);
     void ResetFlags();
diff --git a/dGame/dComponents/MissionComponent.h b/dGame/dComponents/MissionComponent.h
index 6e54a6b0..13a812d2 100644
--- a/dGame/dComponents/MissionComponent.h
+++ b/dGame/dComponents/MissionComponent.h
@@ -29,8 +29,8 @@ public:
 	explicit MissionComponent(Entity* parent);
     ~MissionComponent() override;
     void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags);
-    void LoadFromXml(tinyxml2::XMLDocument* doc);
-    void UpdateXml(tinyxml2::XMLDocument* doc);
+    void LoadFromXml(tinyxml2::XMLDocument* doc) override;
+    void UpdateXml(tinyxml2::XMLDocument* doc) override;
 
     /**
      * Returns all the missions for this entity, mapped by mission ID
diff --git a/dGame/dComponents/ModuleAssemblyComponent.h b/dGame/dComponents/ModuleAssemblyComponent.h
index 28dcfa70..7153f30b 100644
--- a/dGame/dComponents/ModuleAssemblyComponent.h
+++ b/dGame/dComponents/ModuleAssemblyComponent.h
@@ -17,7 +17,7 @@ public:
 	~ModuleAssemblyComponent() override;
 
     void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags);
-    void Update(float deltaTime);
+    void Update(float deltaTime) override;
 
     /**
      * Sets the subkey of this entity
diff --git a/dGame/dComponents/MovementAIComponent.h b/dGame/dComponents/MovementAIComponent.h
index 477c39f4..032732cc 100644
--- a/dGame/dComponents/MovementAIComponent.h
+++ b/dGame/dComponents/MovementAIComponent.h
@@ -61,7 +61,7 @@ public:
 	MovementAIComponent(Entity* parentEntity, MovementAIInfo info);
 	~MovementAIComponent() override;
 	
-	void Update(float deltaTime);
+	void Update(float deltaTime) override;
 
     /**
      * Returns the basic settings that this entity uses to move around
diff --git a/dGame/dComponents/VendorComponent.h b/dGame/dComponents/VendorComponent.h
index 71297be9..fb9dbf6b 100644
--- a/dGame/dComponents/VendorComponent.h
+++ b/dGame/dComponents/VendorComponent.h
@@ -19,7 +19,7 @@ public:
 
 	void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags);
 	
-	void OnUse(Entity* originator);
+	void OnUse(Entity* originator) override;
 	
 	/**
 	 * Gets the buy scaler
diff --git a/dScripts/AmDrawBridge.h b/dScripts/AmDrawBridge.h
index 1b00e2be..e7b801df 100644
--- a/dScripts/AmDrawBridge.h
+++ b/dScripts/AmDrawBridge.h
@@ -7,7 +7,7 @@ public:
     void OnStartup(Entity* self) override;
     void OnUse(Entity* self, Entity* user) override;
     void OnTimerDone(Entity* self, std::string timerName) override;
-    void OnNotifyObject(Entity *self, Entity *sender, const std::string& name, int32_t param1 = 0, int32_t param2 = 0);
+    void OnNotifyObject(Entity *self, Entity *sender, const std::string& name, int32_t param1 = 0, int32_t param2 = 0) override;
 
     void MoveBridgeDown(Entity* self, Entity* bridge, bool down);
     void NotifyDie(Entity* self, Entity* other);
diff --git a/dScripts/BaseConsoleTeleportServer.cpp b/dScripts/BaseConsoleTeleportServer.cpp
index b4e88af7..a9cd74e8 100644
--- a/dScripts/BaseConsoleTeleportServer.cpp
+++ b/dScripts/BaseConsoleTeleportServer.cpp
@@ -25,7 +25,7 @@ void BaseConsoleTeleportServer::BaseOnMessageBoxResponse(Entity* self, Entity* s
 
             if (rocketLaunchComponent == nullptr)
             {
-                rocketLaunchComponent;
+                return;
             }
 
             const auto& teleportZone = self->GetVar<std::u16string>(u"transferZoneID");
diff --git a/dScripts/GfCampfire.h b/dScripts/GfCampfire.h
index 668e7c1d..9e678419 100644
--- a/dScripts/GfCampfire.h
+++ b/dScripts/GfCampfire.h
@@ -4,11 +4,11 @@
 class GfCampfire : public CppScripts::Script 
 {
 public:
-	void OnStartup(Entity* self);
+	void OnStartup(Entity* self) override;
 	void OnFireEventServerSide(Entity *self, Entity *sender, std::string args, int32_t param1, int32_t param2,
-                               int32_t param3);
-	void OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status);
-	void OnTimerDone(Entity* self, std::string timerName);
+                               int32_t param3) override;
+	void OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status) override;
+	void OnTimerDone(Entity* self, std::string timerName) override;
 	void OnSkillEventFired(Entity *self, Entity *caster, const std::string &message) override;
 private:
 	int32_t m_skillCastId = 43;