diff --git a/materialsystem/cmaterialvar.cpp b/materialsystem/cmaterialvar.cpp
index f5d3fd93..ce85ddfb 100644
--- a/materialsystem/cmaterialvar.cpp
+++ b/materialsystem/cmaterialvar.cpp
@@ -23,10 +23,6 @@
 
 #define MATERIALVAR_CHAR_BUF_SIZE 512
 
-/*#if !defined( _X360 )
-#pragma pack (1)
-#endif*/
-
 ConVar mat_texture_tracking( "mat_texture_tracking", IsDebug() ? "1" : "0" );
 CUtlMap<ITexture*, CInterlockedInt> s_TextureRefList( DefLessFunc( ITexture* ) );
 CUtlMap<ITexture*, CInterlockedInt> *g_pTextureRefList = &s_TextureRefList;
diff --git a/materialsystem/shaderapidx9/shaderapidx8.cpp b/materialsystem/shaderapidx9/shaderapidx8.cpp
index 6aa025cc..7accc77c 100644
--- a/materialsystem/shaderapidx9/shaderapidx8.cpp
+++ b/materialsystem/shaderapidx9/shaderapidx8.cpp
@@ -3499,7 +3499,7 @@ void CShaderAPIDx8::ResetRenderState( bool bFullReset )
 	SetRenderState( D3DRS_CULLMODE, D3DCULL_CCW );
 
 	// No shade mode yet
-	m_DynamicState.m_ShadeMode = (D3DSHADEMODE)-1;
+	m_DynamicState.m_ShadeMode = NULL;
 	ShadeMode( SHADER_SMOOTH );
 
 	m_DynamicState.m_bHWMorphingEnabled = false;
diff --git a/public/bitvec.h b/public/bitvec.h
index 3fec8969..0ffbd6ab 100644
--- a/public/bitvec.h
+++ b/public/bitvec.h
@@ -141,7 +141,7 @@ inline unsigned GetEndMask( int numBits )
 }
 
 
-inline int GetBitForBitnum( int bitNum ) 
+inline uint GetBitForBitnum( int bitNum ) 
 { 
 	static int bitsForBitnum[] = 
 	{
diff --git a/public/togl/linuxwin/cglmprogram.h b/public/togl/linuxwin/cglmprogram.h
index e3f4f60a..64dbc121 100644
--- a/public/togl/linuxwin/cglmprogram.h
+++ b/public/togl/linuxwin/cglmprogram.h
@@ -155,7 +155,7 @@ public:
 
 	EGLMProgramType			m_type;					// vertex or pixel
 
-	uint					m_nHashTag;				// serial number for hashing
+	unsigned long m_nHashTag;				// serial number for hashing
 	
 	char					*m_text;				// copy of text passed into constructor.  Can change if editable shaders is enabled.
 													// note - it can contain multiple flavors, so use CGLMTextSectioner to scan it and locate them
diff --git a/tier1/bitbuf.cpp b/tier1/bitbuf.cpp
index 52a25e4d..0a2a63fa 100644
--- a/tier1/bitbuf.cpp
+++ b/tier1/bitbuf.cpp
@@ -114,7 +114,7 @@ public:
 
 		for ( unsigned int littleBit=0; littleBit < 32; littleBit++ )
 			StoreLittleDWord( &g_LittleBits[littleBit], 0, 1u<<littleBit );
-	}
+	}                     
 };
 static CBitWriteMasksInit g_BitWriteMasksInit;