diff --git a/public/eiface.h b/public/eiface.h
index c85a6234..dd35db92 100644
--- a/public/eiface.h
+++ b/public/eiface.h
@@ -111,8 +111,9 @@ struct bbox_t
 	Vector maxs;
 };
 
-struct CEntityIndex
+class CEntityIndex
 {
+public:
 	CEntityIndex( int index )
 	{
 		_index = index;
diff --git a/public/tier0/platform.h b/public/tier0/platform.h
index 21cecf37..9ad20af4 100644
--- a/public/tier0/platform.h
+++ b/public/tier0/platform.h
@@ -1347,7 +1347,7 @@ inline void Destruct( T* pMemory )
 	pMemory->~T();
 
 #ifdef _DEBUG
-	memset( pMemory, 0xDD, sizeof(T) );
+	memset( (void*)pMemory, 0xDD, sizeof(T) );
 #endif
 }
 
diff --git a/public/tier1/strtools.h b/public/tier1/strtools.h
index 520a3162..7d37a515 100644
--- a/public/tier1/strtools.h
+++ b/public/tier1/strtools.h
@@ -16,9 +16,9 @@
 #elif POSIX
 #include <ctype.h>
 #include <wchar.h>
-#include <math.h>
 #endif
 
+#include <math.h>
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/public/tier1/utlsymbollarge.h b/public/tier1/utlsymbollarge.h
index bb704e60..9ac51118 100644
--- a/public/tier1/utlsymbollarge.h
+++ b/public/tier1/utlsymbollarge.h
@@ -120,7 +120,7 @@ inline uint32 CUtlSymbolLarge_Hash( bool CASEINSENSITIVE, const char *pString, i
 	return ( CASEINSENSITIVE ? HashStringCaseless( pString ) : HashString( pString ) ); 
 }
 
-typedef uint32 LargeSymbolTableHashDecoration_t; 
+typedef uint64 LargeSymbolTableHashDecoration_t; 
 
 // The structure consists of the hash immediately followed by the string data
 struct CUtlSymbolTableLargeBaseTreeEntry_t