diff --git a/kraken/KRCamera.h b/kraken/KRCamera.h
index 90502cb..30eb909 100755
--- a/kraken/KRCamera.h
+++ b/kraken/KRCamera.h
@@ -64,9 +64,9 @@ public:
   const KRViewport& getViewport() const;
 
 
-  virtual std::string getElementName();
-  virtual tinyxml2::XMLElement* saveXML(tinyxml2::XMLNode* parent);
-  virtual void loadXML(tinyxml2::XMLElement* e);
+  virtual std::string getElementName() override;
+  virtual tinyxml2::XMLElement* saveXML(tinyxml2::XMLNode* parent) override;
+  virtual void loadXML(tinyxml2::XMLElement* e) override;
 
   std::string getDebugText();
 
diff --git a/kraken/KRDeviceManager.cpp b/kraken/KRDeviceManager.cpp
index c39a662..806f0de 100644
--- a/kraken/KRDeviceManager.cpp
+++ b/kraken/KRDeviceManager.cpp
@@ -93,7 +93,7 @@ KRDeviceManager::initialize()
 
   // VK_KHR_surface and VK_KHR_win32_surface
 
-  char* extensions[] = {
+  const char* extensions[] = {
     "VK_KHR_surface",
 #if KRENGINE_DEBUG_GPU_LABELS
     "VK_EXT_debug_utils",
diff --git a/kraken/KRMeshManager.cpp b/kraken/KRMeshManager.cpp
index d7d1b4b..851cfb3 100755
--- a/kraken/KRMeshManager.cpp
+++ b/kraken/KRMeshManager.cpp
@@ -553,7 +553,7 @@ void KRMeshManager::KRVBOData::load(VkCommandBuffer& commandBuffer)
 #if KRENGINE_DEBUG_GPU_LABELS
     char debug_label[KRENGINE_DEBUG_GPU_LABEL_MAX_LEN];
 
-    char* type_label = "";
+    const char* type_label = "";
 
     switch (m_type) {
     case vbo_type::STREAMING:
diff --git a/kraken/KRPresentationThread.cpp b/kraken/KRPresentationThread.cpp
index fbf4edb..3d25c5f 100644
--- a/kraken/KRPresentationThread.cpp
+++ b/kraken/KRPresentationThread.cpp
@@ -132,7 +132,7 @@ void KRPresentationThread::renderFrame()
     if (result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR || resized) {
       // TODO - Must explicitly detect resize and trigger swapchain re-creation as well
       vkDeviceWaitIdle(device.m_logicalDevice);
-      if (surface.recreateSwapChain() != VK_SUCCESS) {
+      if (surface.recreateSwapChain() != KR_SUCCESS) {
         m_activeState = PresentThreadState::error;
       }
       break;
@@ -203,4 +203,4 @@ void KRPresentationThread::renderFrame()
 
     m_currentFrame = (m_currentFrame + 1) % KRENGINE_MAX_FRAMES_IN_FLIGHT;
   }
-}
\ No newline at end of file
+}
diff --git a/kraken/KRShader.cpp b/kraken/KRShader.cpp
index 22fbc3f..1b40317 100644
--- a/kraken/KRShader.cpp
+++ b/kraken/KRShader.cpp
@@ -102,6 +102,10 @@ VkShaderStageFlagBits getShaderStageFlagBitsFromShaderStage(ShaderStage stage)
     return VK_SHADER_STAGE_MISS_BIT_KHR;
   case ShaderStage::rcall:
     return VK_SHADER_STAGE_CALLABLE_BIT_KHR;
+  case ShaderStage::ShaderStageCount:
+  case ShaderStage::Invalid:
+    // Suppress warning
+    break;
   }
   return (VkShaderStageFlagBits)0;
 }
diff --git a/kraken/KRTexture2D.h b/kraken/KRTexture2D.h
index 9d39fd4..b1e491d 100755
--- a/kraken/KRTexture2D.h
+++ b/kraken/KRTexture2D.h
@@ -45,8 +45,8 @@ class KRTexture2D : public KRTexture
 public:
   KRTexture2D(KRContext& context, mimir::Block* data, std::string name);
   virtual ~KRTexture2D();
-  virtual bool save(const std::string& path);
-  virtual bool save(mimir::Block& data);
+  virtual bool save(const std::string& path) override;
+  virtual bool save(mimir::Block& data) override;
 
   virtual bool uploadTexture(KRDevice& device, VkImage& image, int lod_max_dim, int& current_lod_max_dim, bool premultiply_alpha = false) = 0;
   virtual hydra::Vector2i getDimensions() const = 0;
diff --git a/kraken/KRTextureAnimated.h b/kraken/KRTextureAnimated.h
index 95a649a..1a330e6 100755
--- a/kraken/KRTextureAnimated.h
+++ b/kraken/KRTextureAnimated.h
@@ -41,17 +41,17 @@ class KRTextureAnimated : public KRTexture
 public:
   KRTextureAnimated(KRContext& context, std::string name);
   virtual ~KRTextureAnimated();
-  virtual std::string getExtension();
-  virtual bool save(const std::string& path);
-  virtual bool save(Block& data);
+  virtual std::string getExtension() override;
+  virtual bool save(const std::string& path) override;
+  virtual bool save(Block& data) override;
 
-  virtual long getMemRequiredForSize(int max_dim);
-  virtual void resetPoolExpiry(float lodCoverage, texture_usage_t textureUsage);
+  virtual long getMemRequiredForSize(int max_dim) override;
+  virtual void resetPoolExpiry(float lodCoverage, texture_usage_t textureUsage) override;
 
-  virtual long getReferencedMemSize();
+  virtual long getReferencedMemSize() override;
 
-  virtual bool isAnimated();
-  virtual void resize(int max_dim);
+  virtual bool isAnimated() override;
+  virtual void resize(int max_dim) override;
   virtual int getFaceCount() const override;
   virtual VkFormat getFormat() const override;
 
diff --git a/kraken/KRTextureCube.h b/kraken/KRTextureCube.h
index 5de7b60..1a6ff16 100755
--- a/kraken/KRTextureCube.h
+++ b/kraken/KRTextureCube.h
@@ -40,12 +40,12 @@ class KRTextureCube : public KRTexture
 public:
   KRTextureCube(KRContext& context, std::string name);
   virtual ~KRTextureCube();
-  virtual std::string getExtension();
-  virtual bool save(const std::string& path);
-  virtual bool save(mimir::Block& data);
+  virtual std::string getExtension() override;
+  virtual bool save(const std::string& path) override;
+  virtual bool save(mimir::Block& data) override;
 
-  virtual long getMemRequiredForSize(int max_dim);
-  virtual void resetPoolExpiry(float lodCoverage, texture_usage_t textureUsage);
+  virtual long getMemRequiredForSize(int max_dim) override;
+  virtual void resetPoolExpiry(float lodCoverage, texture_usage_t textureUsage) override;
   virtual int getFaceCount() const override;
   virtual VkFormat getFormat() const override;
 
diff --git a/kraken/KRTextureKTX.h b/kraken/KRTextureKTX.h
index 0374e11..c143764 100755
--- a/kraken/KRTextureKTX.h
+++ b/kraken/KRTextureKTX.h
@@ -41,11 +41,11 @@ public:
   KRTextureKTX(KRContext& context, Block* data, std::string name);
   KRTextureKTX(KRContext& context, std::string name, unsigned int internal_format, unsigned int base_internal_format, int width, int height, const std::list<Block*>& blocks);
   virtual ~KRTextureKTX();
-  virtual std::string getExtension();
+  virtual std::string getExtension() override;
 
   bool uploadTexture(KRDevice& device, VkImage& image, int lod_max_dim, int& current_lod_max_dim, bool premultiply_alpha = false) override;
 
-  virtual long getMemRequiredForSize(int max_dim);
+  virtual long getMemRequiredForSize(int max_dim) override;
   virtual hydra::Vector2i getDimensions() const override;
   virtual int getFaceCount() const override;
   virtual VkFormat getFormat() const override;
diff --git a/kraken/KRTextureKTX2.h b/kraken/KRTextureKTX2.h
index b72d907..d4e3d7b 100644
--- a/kraken/KRTextureKTX2.h
+++ b/kraken/KRTextureKTX2.h
@@ -38,11 +38,11 @@ class KRTextureKTX2 : public KRTexture2D
 public:
   KRTextureKTX2(KRContext& context, mimir::Block* data, std::string name);
   virtual ~KRTextureKTX2();
-  virtual std::string getExtension();
+  virtual std::string getExtension() override;
 
   bool uploadTexture(KRDevice& device, VkImage& image, int lod_max_dim, int& current_lod_max_dim, bool premultiply_alpha = false) override;
 
-  virtual long getMemRequiredForSize(int max_dim);
+  virtual long getMemRequiredForSize(int max_dim) override;
   virtual hydra::Vector2i getDimensions() const override;
   virtual int getFaceCount() const override;
   virtual VkFormat getFormat() const override;
diff --git a/kraken/KRTexturePVR.h b/kraken/KRTexturePVR.h
index ba0f889..f34f01e 100755
--- a/kraken/KRTexturePVR.h
+++ b/kraken/KRTexturePVR.h
@@ -38,11 +38,11 @@ class KRTexturePVR : public KRTexture2D
 public:
   KRTexturePVR(KRContext& context, mimir::Block* data, std::string name);
   virtual ~KRTexturePVR();
-  virtual std::string getExtension();
+  virtual std::string getExtension() override;
 
   bool uploadTexture(KRDevice& device, VkImage& image, int lod_max_dim, int& current_lod_max_dim, bool premultiply_alpha = false) override;
 
-  virtual long getMemRequiredForSize(int max_dim);
+  virtual long getMemRequiredForSize(int max_dim) override;
   virtual hydra::Vector2i getDimensions() const override;
   virtual VkFormat getFormat() const override;
   virtual int getFaceCount() const override;
diff --git a/kraken/KRTextureTGA.h b/kraken/KRTextureTGA.h
index 1f60500..b1ab998 100755
--- a/kraken/KRTextureTGA.h
+++ b/kraken/KRTextureTGA.h
@@ -40,15 +40,15 @@ class KRTextureTGA : public KRTexture2D
 public:
   KRTextureTGA(KRContext& context, Block* data, std::string name);
   virtual ~KRTextureTGA();
-  virtual std::string getExtension();
+  virtual std::string getExtension() override;
 
   bool uploadTexture(KRDevice& device, VkImage& image, int lod_max_dim, int& current_lod_max_dim, bool premultiply_alpha = false) override;
 
 #if !TARGET_OS_IPHONE && !defined(ANDROID)
-  virtual KRTexture* compress(bool premultiply_alpha = false);
+  virtual KRTexture* compress(bool premultiply_alpha = false) override;
 #endif
 
-  virtual long getMemRequiredForSize(int max_dim);
+  virtual long getMemRequiredForSize(int max_dim) override;
   virtual hydra::Vector2i getDimensions() const override;
   virtual VkFormat getFormat() const override;
   virtual int getFaceCount() const override;