diff --git a/rpcs3/Emu/RSX/Common/surface_cache_dma.hpp b/rpcs3/Emu/RSX/Common/surface_cache_dma.hpp
index 383fd9485a..a4aa58b3e3 100644
--- a/rpcs3/Emu/RSX/Common/surface_cache_dma.hpp
+++ b/rpcs3/Emu/RSX/Common/surface_cache_dma.hpp
@@ -43,7 +43,7 @@ namespace rsx
 	public:
 		surface_cache_dma()
 		{
-			for (usz i = 0; i < m_buffer_list.size(); ++i)
+			for (u32 i = 0; i < ::size32(m_buffer_list); ++i)
 			{
 				m_buffer_list[i].id = i;
 			}
diff --git a/rpcs3/Emu/RSX/Common/surface_store.h b/rpcs3/Emu/RSX/Common/surface_store.h
index 6bd77704be..a3bae7b377 100644
--- a/rpcs3/Emu/RSX/Common/surface_store.h
+++ b/rpcs3/Emu/RSX/Common/surface_store.h
@@ -718,7 +718,8 @@ namespace rsx
 				while (length >= 8)
 				{
 					auto& value = *utils::bless<u64>(dst_ptr);
-					mask |= (~value);                          // If the value is not all 1s, set valid to true
+					const u64 block_mask = ~value;              // If the value is not all 1s, set valid to true
+					mask |= block_mask;
 					value = umax;
 
 					dst_ptr += 8;
@@ -728,7 +729,8 @@ namespace rsx
 				if (length >= 4)
 				{
 					auto& value = *utils::bless<u32>(dst_ptr);
-					mask |= (~value);
+					const u32 block_mask = ~value;
+					mask |= block_mask;
 					value = umax;
 
 					dst_ptr += 4;
@@ -738,7 +740,8 @@ namespace rsx
 				if (length >= 2)
 				{
 					auto& value = *utils::bless<u16>(dst_ptr);
-					mask |= (~value);
+					const u16 block_mask = ~value;
+					mask |= block_mask;
 					value = umax;
 
 					dst_ptr += 2;
@@ -748,7 +751,8 @@ namespace rsx
 				if (length)
 				{
 					auto& value = *dst_ptr;
-					mask |= (~value);
+					const u8 block_mask = ~value;
+					mask |= block_mask;
 					value = umax;
 				}
 
diff --git a/rpcs3/Emu/RSX/GL/GLCompute.cpp b/rpcs3/Emu/RSX/GL/GLCompute.cpp
index c6a4767eb2..58bc8e5660 100644
--- a/rpcs3/Emu/RSX/GL/GLCompute.cpp
+++ b/rpcs3/Emu/RSX/GL/GLCompute.cpp
@@ -258,8 +258,8 @@ namespace gl
 		cs_shuffle_base::run(cmd, data, num_texels * 4, data_offset);
 	}
 
-	template class cs_shuffle_d32fx8_to_x8d24f<true>;
-	template class cs_shuffle_d32fx8_to_x8d24f<false>;
+	template struct cs_shuffle_d32fx8_to_x8d24f<true>;
+	template struct cs_shuffle_d32fx8_to_x8d24f<false>;
 
 	template <bool SwapBytes>
 	cs_shuffle_x8d24f_to_d32fx8<SwapBytes>::cs_shuffle_x8d24f_to_d32fx8()
@@ -313,8 +313,8 @@ namespace gl
 		cs_shuffle_base::run(cmd, data, num_texels * 4, data_offset);
 	}
 
-	template class cs_shuffle_x8d24f_to_d32fx8<true>;
-	template class cs_shuffle_x8d24f_to_d32fx8<false>;
+	template struct cs_shuffle_x8d24f_to_d32fx8<true>;
+	template struct cs_shuffle_x8d24f_to_d32fx8<false>;
 
 	cs_d24x8_to_ssbo::cs_d24x8_to_ssbo()
 	{