diff --git a/src/bgfx.cpp b/src/bgfx.cpp
index e401e1c9e..bc3d83f7a 100644
--- a/src/bgfx.cpp
+++ b/src/bgfx.cpp
@@ -210,7 +210,7 @@ namespace bgfx
 #if BGFX_CONFIG_MEMORY_TRACKING
 		// BK - CallbackStub will be deleted after printing this info, so there is always one
 		// leak if CallbackStub is used.
-		BX_WARN( (NULL != s_callbackStub ? 1 : 0) == m_numBlocks
+		BX_WARN(uint32_t(NULL != s_callbackStub ? 1 : 0) == m_numBlocks
 			, "MEMORY LEAK: %d (max: %d)"
 			, m_numBlocks
 			, m_maxBlocks
diff --git a/src/bgfx_compute.sh b/src/bgfx_compute.sh
index b242d8e0b..af8dd3e32 100644
--- a/src/bgfx_compute.sh
+++ b/src/bgfx_compute.sh
@@ -71,25 +71,12 @@ vec2 unpackHalf2x16(uint _x)
 #define NUM_THREADS(_x, _y, _z) [numthreads(_x, _y, _z)]
 
 #define __IMAGE_IMPL(_textureType, _storeComponents, _type, _loadComponents) \
-			_type imageLoad(Texture2D<_textureType> _image, ivec2 _uv) \
-			{ \
-				return _image.mips[0][_uv]._loadComponents; \
-			} \
-			\
-			void imageStore(RWTexture2D<_textureType> _image, ivec2 _uv, _type _value) \
-			{ \
-				_image[_uv] = _value._storeComponents; \
-			} \
-			\
-			_type imageLoad(Texture3D<_textureType> _image, ivec3 _uv) \
-			{ \
-				return _image.mips[0][_uv]._loadComponents; \
-			} \
-			\
-			void imageStore(RWTexture3D<_textureType> _image, ivec3 _uv, _type _value) \
-			{ \
-				_image[_uv] = _value._storeComponents; \
-			}
+	_type imageLoad(  Texture2D<_textureType> _image, ivec2 _uv)                { return _image[_uv ]._loadComponents;    } \
+	_type imageLoad(  Texture3D<_textureType> _image, ivec3 _uvw)               { return _image[_uvw]._loadComponents;    } \
+	_type imageLoad(RWTexture2D<_textureType> _image, ivec2 _uv)                { return _image[_uv ]._loadComponents;    } \
+	_type imageLoad(RWTexture3D<_textureType> _image, ivec3 _uvw, _type _value) { return _image[_uvw]._loadComponents;    } \
+	void imageStore(RWTexture2D<_textureType> _image, ivec2 _uv,  _type _value) { _image[_uv ] = _value._storeComponents; } \
+	void imageStore(RWTexture3D<_textureType> _image, ivec3 _uvw, _type _value) { _image[_uvw] = _value._storeComponents; }
 
 __IMAGE_IMPL(float, x,    vec4,  xxxx)
 __IMAGE_IMPL(vec2,  xy,   vec4,  xyyy)
@@ -104,12 +91,6 @@ __IMAGE_IMPL(ivec2, xy,   ivec4, xyyy)
 __IMAGE_IMPL(ivec3, xyz,  ivec4, xyzz)
 __IMAGE_IMPL(ivec4, xyzw, ivec4, xyzw)
 
-uint4 imageLoad(RWTexture2D<uint> _image, ivec2 _uv)
-{
-	uint rr = _image[_uv.xy];
-	return uint4(rr, rr, rr, rr);
-}
-
 ivec2 imageSize(Texture2D _image)
 {
 	ivec2 result;