diff --git a/rpcs3/Emu/RSX/Common/ProgramStateCache.h b/rpcs3/Emu/RSX/Common/ProgramStateCache.h
index ad819b5ef9..66dd111204 100644
--- a/rpcs3/Emu/RSX/Common/ProgramStateCache.h
+++ b/rpcs3/Emu/RSX/Common/ProgramStateCache.h
@@ -351,7 +351,8 @@ public:
 			{
 				//Lower NaNs to 0
 				const auto mask = _mm_cmpunord_ps((__m128&)shuffled_vector, _mm_set1_ps(1.f));
-				_mm_stream_si128((__m128i*)dst, (__m128i&)_mm_andnot_ps(mask, (__m128&)shuffled_vector));
+				const auto result = _mm_andnot_ps(mask, (__m128&)shuffled_vector);
+				_mm_stream_si128((__m128i*)dst, (__m128i&)result);
 			}
 			else
 			{
diff --git a/rpcs3/Emu/RSX/GL/GLHelpers.h b/rpcs3/Emu/RSX/GL/GLHelpers.h
index ce356ebb66..c131bf3c15 100644
--- a/rpcs3/Emu/RSX/GL/GLHelpers.h
+++ b/rpcs3/Emu/RSX/GL/GLHelpers.h
@@ -1094,7 +1094,7 @@ namespace gl
 			return m_format;
 		}
 
-		buffer* buffer() const
+		buffer* value() const
 		{
 			return m_buffer;
 		}
@@ -1756,7 +1756,7 @@ namespace gl
 
 		void copy_from(buffer_view &view)
 		{
-			copy_from(*view.buffer(), view.format(), view.offset(), view.range());
+			copy_from(*view.value(), view.format(), view.offset(), view.range());
 		}
 
 		void copy_from(const buffer& buf, texture::format format, texture::type type, class pixel_unpack_settings pixel_settings)