diff --git a/engine/cl_demo.cpp b/engine/cl_demo.cpp
index f4417878..f7d96ec4 100644
--- a/engine/cl_demo.cpp
+++ b/engine/cl_demo.cpp
@@ -686,7 +686,7 @@ void CDemoRecorder::CloseDemoFile()
 
 		m_DemoFile.Close();
 
-		g_ClientDLL->OnDemoRecordStop();
+		if( g_ClientDLL ) g_ClientDLL->OnDemoRecordStop();
 	}
 
 	m_bCloseDemoFile = false;
diff --git a/materialsystem/CColorCorrection.cpp b/materialsystem/CColorCorrection.cpp
index 46246658..fa72bed4 100644
--- a/materialsystem/CColorCorrection.cpp
+++ b/materialsystem/CColorCorrection.cpp
@@ -82,7 +82,12 @@ void ColorCorrectionLookup_t::AllocTexture()
 	sprintf( name, "ColorCorrection - %p", m_Handle );
 
 	m_pColorCorrectionTexture = ITextureInternal::CreateProceduralTexture( name, TEXTURE_GROUP_OTHER,
-		COLOR_CORRECTION_TEXTURE_SIZE, COLOR_CORRECTION_TEXTURE_SIZE, COLOR_CORRECTION_TEXTURE_SIZE, IMAGE_FORMAT_BGRX8888,
+		COLOR_CORRECTION_TEXTURE_SIZE, COLOR_CORRECTION_TEXTURE_SIZE, COLOR_CORRECTION_TEXTURE_SIZE,
+#ifdef DX_TO_GL_ABSTRACTION
+		IMAGE_FORMAT_RGBA8888,
+#else
+		IMAGE_FORMAT_BGRX8888,
+#endif
 		TEXTUREFLAGS_NOMIP | TEXTUREFLAGS_NOLOD | TEXTUREFLAGS_SINGLECOPY | TEXTUREFLAGS_CLAMPS | 
 		TEXTUREFLAGS_CLAMPT | TEXTUREFLAGS_CLAMPU | TEXTUREFLAGS_NODEBUGOVERRIDE );
 
diff --git a/public/sentence.cpp b/public/sentence.cpp
index 49994780..ea06426e 100644
--- a/public/sentence.cpp
+++ b/public/sentence.cpp
@@ -345,10 +345,6 @@ unsigned int CPhonemeTag::ComputeDataCheckSum()
 //-----------------------------------------------------------------------------
 // Purpose: Simple language to string and string to language lookup dictionary
 //-----------------------------------------------------------------------------
-#if defined(__i386__) || defined(__x86_64__)
-#pragma pack(1)
-#endif
-
 struct CCLanguage
 {
 	int				type;
@@ -371,9 +367,6 @@ static CCLanguage g_CCLanguageLookup[] =
 	{ CC_THAI,		"thai",			0 ,		150,	250 },
 	{ CC_PORTUGUESE,"portuguese",	0 ,		0,		150 },	
 };
-#if defined(__i386__) || defined(__x86_64__)
-#pragma pack()
-#endif
 
 void CSentence::ColorForLanguage( int language, unsigned char& r, unsigned char& g, unsigned char& b )
 {
@@ -1767,4 +1760,4 @@ void CSentence::CreateEventWordDistribution( char const *pszText, float flSenten
 }
 
 
-#endif // !_STATIC_LINKED || _SHARED_LIB
\ No newline at end of file
+#endif // !_STATIC_LINKED || _SHARED_LIB