diff --git a/common/src/Utilities/AlignedMalloc.cpp b/common/src/Utilities/AlignedMalloc.cpp
index 06ff8bd989..2a56355c4d 100644
--- a/common/src/Utilities/AlignedMalloc.cpp
+++ b/common/src/Utilities/AlignedMalloc.cpp
@@ -95,7 +95,7 @@ __fi void _memset16_unaligned( void* dest, u16 data, size_t size )
 		*dst = data;
 }
 
-__fi void HostSys::Munmap( void* base, u32 size )
+__fi void HostSys::Munmap( void* base, size_t size )
 {
 	Munmap( (uptr)base, size );
 }
diff --git a/common/src/Utilities/HashTools.cpp b/common/src/Utilities/HashTools.cpp
index c5c3ad3061..8ffdb0255e 100644
--- a/common/src/Utilities/HashTools.cpp
+++ b/common/src/Utilities/HashTools.cpp
@@ -29,16 +29,7 @@ namespace HashTools {
 /// <seealso cref="CommonHashClass"/>
 const CommonHashClass GetCommonHash;
 
-#undef get16bits
-#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__) \
-  || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__)
 #define get16bits(d) (*((const u16 *) (d)))
-#endif
-
-#if !defined (get16bits)
-#define get16bits(d) ((((u32)(((const ubyte *)(d))[1])) << 8)\
-					   +(u32)(((const ubyte *)(d))[0]) )
-#endif
 
 /// <summary>
 ///   Calculates a hash value for an arbitrary set of binary data.
diff --git a/common/src/Utilities/VirtualMemory.cpp b/common/src/Utilities/VirtualMemory.cpp
index 2e8742354e..a0cfb50c41 100644
--- a/common/src/Utilities/VirtualMemory.cpp
+++ b/common/src/Utilities/VirtualMemory.cpp
@@ -455,7 +455,7 @@ SpatialArrayReserve& SpatialArrayReserve::SetBlockSizeInPages( uint pages )
 //
 // This method must be called prior to accessing or modifying the array contents.  Calls to
 // a modified buffer will be ignored (and generate an assertion in dev/debug modes).
-uint SpatialArrayReserve::SetBlockSize( uint bytes )
+uptr SpatialArrayReserve::SetBlockSize( uptr bytes )
 {
 	SetBlockSizeInPages((bytes + __pagesize - 1) / __pagesize);
 	return m_blocksize * __pagesize;