diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/VkClearManager.cpp b/MobileGL/MG_Backend/DirectVulkan/Renderer/VkClearManager.cpp
index 08b9fdb7..929ec571 100644
--- a/MobileGL/MG_Backend/DirectVulkan/Renderer/VkClearManager.cpp
+++ b/MobileGL/MG_Backend/DirectVulkan/Renderer/VkClearManager.cpp
@@ -18,7 +18,7 @@ namespace MobileGL::MG_Backend::DirectVulkan {
     }
 
     void VkClearManager::QueueClear(GLbitfield mask, const ClearFramebufferPayload& clearPayload,
-                                    MG_State::GLState::FramebufferObject& drawFbo) {
+                                    const MG_State::GLState::FramebufferObject& drawFbo) {
         if (mask & GL_COLOR_BUFFER_BIT) {
             auto& drawbufs = drawFbo.GetDrawBuffers();
             // This should automatically work on default & offscreen FBO
@@ -53,7 +53,7 @@ namespace MobileGL::MG_Backend::DirectVulkan {
 
     void VkClearManager::QueueClear(const ClearAttachmentPayload& clearPayload,
                                     const SharedPtr<MG_State::GLState::ITextureObject>& texture) {
-        WeakPtr weakTexturePtr = texture;
+        WeakPtr<MG_State::GLState::ITextureObject> weakTexturePtr = texture;
         if (weakTexturePtr.expired())
             return;
         auto* pTexture = weakTexturePtr.lock().get();
diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/VkClearManager.h b/MobileGL/MG_Backend/DirectVulkan/Renderer/VkClearManager.h
index ad511026..f4906f9c 100644
--- a/MobileGL/MG_Backend/DirectVulkan/Renderer/VkClearManager.h
+++ b/MobileGL/MG_Backend/DirectVulkan/Renderer/VkClearManager.h
@@ -36,7 +36,7 @@ namespace MobileGL::MG_Backend::DirectVulkan {
         Bool Initialize();
         void Shutdown();
 
-        void QueueClear(GLbitfield mask, const ClearFramebufferPayload& clearPayload, MG_State::GLState::FramebufferObject& drawFbo);
+        void QueueClear(GLbitfield mask, const ClearFramebufferPayload& clearPayload, const MG_State::GLState::FramebufferObject& drawFbo);
         void QueueClear(
             const ClearAttachmentPayload& clearPayload,
             const SharedPtr<MG_State::GLState::ITextureObject>& texture);
diff --git a/MobileGL/MG_State/GLState/Core.cpp b/MobileGL/MG_State/GLState/Core.cpp
index dc91933a..24a4364c 100644
--- a/MobileGL/MG_State/GLState/Core.cpp
+++ b/MobileGL/MG_State/GLState/Core.cpp
@@ -316,7 +316,7 @@ namespace MobileGL {
                 m_renderState.SetClearStencil(stencil);
             }
 
-            Int GLContext::GetClearStencil() const {
+            Uint32 GLContext::GetClearStencil() const {
                 return m_renderState.GetClearStencil();
             }
 
diff --git a/MobileGL/MG_State/GLState/Core.h b/MobileGL/MG_State/GLState/Core.h
index 3bc61ea6..558d9d3f 100644
--- a/MobileGL/MG_State/GLState/Core.h
+++ b/MobileGL/MG_State/GLState/Core.h
@@ -112,7 +112,7 @@ namespace MobileGL {
                 void SetClearDepth(Float depth);
                 Float GetClearDepth() const;
                 void SetClearStencil(Int stencil);
-                Int GetClearStencil() const;
+                Uint32 GetClearStencil() const;
                 void SetPixelStoreParam(PixelStoreParam param, Int value);
                 Int GetPixelStoreParam(PixelStoreParam param) const;
                 PixelStoreParameters GetPixelStoreParameters(Bool isUnpack) const;
diff --git a/MobileGL/MG_State/GLState/RenderState/RenderState.cpp b/MobileGL/MG_State/GLState/RenderState/RenderState.cpp
index 434af714..1383f743 100644
--- a/MobileGL/MG_State/GLState/RenderState/RenderState.cpp
+++ b/MobileGL/MG_State/GLState/RenderState/RenderState.cpp
@@ -229,7 +229,7 @@ namespace MobileGL {
                 ++m_version;
             }
 
-            Int RenderState::GetClearStencil() const {
+            Uint32 RenderState::GetClearStencil() const {
                 return m_parameters.ClearStencil;
             }
 
diff --git a/MobileGL/MG_State/GLState/RenderState/RenderState.h b/MobileGL/MG_State/GLState/RenderState/RenderState.h
index 6f7b4096..1ec402cf 100644
--- a/MobileGL/MG_State/GLState/RenderState/RenderState.h
+++ b/MobileGL/MG_State/GLState/RenderState/RenderState.h
@@ -154,7 +154,7 @@ namespace MobileGL {
         // Clear State
         FloatVec4 ClearColor = FloatVec4(0.0f, 0.0f, 0.0f, 1.0f);
         Float ClearDepth = 1.0f;
-        Int ClearStencil = 0;
+        Uint32 ClearStencil = 0;
 
         // Cull Face
         Bool CullFaceEnabled = false;
@@ -209,7 +209,7 @@ namespace MobileGL {
                 void SetClearDepth(Float depth);
                 Float GetClearDepth() const;
                 void SetClearStencil(Int stencil);
-                Int GetClearStencil() const;
+                Uint32 GetClearStencil() const;
 
                 // Pixel Store
                 void SetPixelStoreParam(PixelStoreParam param, Int value);