diff --git a/source/lib/res/sound/snd_mgr.cpp b/source/lib/res/sound/snd_mgr.cpp
index b08feb1039..5054e5472f 100644
--- a/source/lib/res/sound/snd_mgr.cpp
+++ b/source/lib/res/sound/snd_mgr.cpp
@@ -554,8 +554,8 @@ static void al_src_init()
  */
 static void al_src_shutdown()
 {
-	debug_assert(std::count(al_srcs_free, al_srcs_free+al_src_allocated, 0) == 0);
-	debug_assert(std::count(al_srcs_used, al_srcs_used+al_src_allocated, 0) == (ptrdiff_t)al_src_allocated);
+	debug_assert(std::count(al_srcs_free, al_srcs_free+al_src_allocated, (uintptr_t)0) == 0);
+	debug_assert(std::count(al_srcs_used, al_srcs_used+al_src_allocated, (uintptr_t)0) == (ptrdiff_t)al_src_allocated);
 
 	AL_CHECK;
 
diff --git a/source/lib/sysdep/stl.h b/source/lib/sysdep/stl.h
index efbeef7ade..776dbd8823 100644
--- a/source/lib/sysdep/stl.h
+++ b/source/lib/sysdep/stl.h
@@ -148,7 +148,7 @@ template<> struct hash<const void*>
 	{
 		union {
 			const void* ptr;
-			u8 bytes[sizeof(void*)];
+			unsigned char bytes[sizeof(void*)];
 		} val;
 		size_t h = 5381;
 
diff --git a/source/maths/tests/test_Matrix3d.h b/source/maths/tests/test_Matrix3d.h
index 8fd8d5f307..dcd89b1102 100644
--- a/source/maths/tests/test_Matrix3d.h
+++ b/source/maths/tests/test_Matrix3d.h
@@ -44,7 +44,7 @@ public:
 				for (int y = 0; y < 4; ++y)
 				{
 					const float expected = (x==y)? 1.0f : 0.0f;
-					TS_ASSERT_DELTA(m(x,y), expected, 0.0001f);
+					TS_ASSERT_DELTA(m(x,y), expected, 0.0002f);
 				}
 			}
 		}
diff --git a/source/ps/XML/tests/test_XeroXMB.h b/source/ps/XML/tests/test_XeroXMB.h
index 226408a566..559d5b343a 100644
--- a/source/ps/XML/tests/test_XeroXMB.h
+++ b/source/ps/XML/tests/test_XeroXMB.h
@@ -44,6 +44,11 @@ private:
 		return xmb;
 	}
 
+	void tearDown()
+	{
+		m_Buffer.reset();
+	}
+
 public:
 	void test_basic()
 	{
diff --git a/source/simulation/EntityStateProcessing.cpp b/source/simulation/EntityStateProcessing.cpp
index 8eb95a74b5..3f01499c77 100644
--- a/source/simulation/EntityStateProcessing.cpp
+++ b/source/simulation/EntityStateProcessing.cpp
@@ -510,7 +510,7 @@ bool CEntity::ProcessContactActionNoPathing( CEntityOrder* current, int timestep
 
 		if( ( m_fsm_cyclepos <= action->m_Speed ) && ( nextpos > action->m_Speed ) )
 		{
-			const size_t soundGroupIndex = m_base->m_SoundGroupTable[animation];
+//			const size_t soundGroupIndex = m_base->m_SoundGroupTable[animation];
 //			g_soundGroupMgr->PlayNext(soundGroupIndex, m_position);
 
 			if(!DispatchEvent( &contactEvent ))