diff --git a/src/game/client/Release_openmod/client.dll b/src/game/client/Release_openmod/client.dll
index a8765b90..4892ecad 100644
Binary files a/src/game/client/Release_openmod/client.dll and b/src/game/client/Release_openmod/client.dll differ
diff --git a/src/game/server/Release_openmod/server.dll b/src/game/server/Release_openmod/server.dll
index 1fdb56bf..40aa5dbf 100644
Binary files a/src/game/server/Release_openmod/server.dll and b/src/game/server/Release_openmod/server.dll differ
diff --git a/src/game/server/Release_openmod/vc120.pdb b/src/game/server/Release_openmod/vc120.pdb
index cd5dfa43..d737613a 100644
Binary files a/src/game/server/Release_openmod/vc120.pdb and b/src/game/server/Release_openmod/vc120.pdb differ
diff --git a/src/game/server/soundscape_system.cpp b/src/game/server/soundscape_system.cpp
index 29b29402..4eb5b213 100644
--- a/src/game/server/soundscape_system.cpp
+++ b/src/game/server/soundscape_system.cpp
@@ -62,7 +62,7 @@ void CSoundscapeSystem::AddSoundscapeFile( const char *filename )
 	MEM_ALLOC_CREDIT();
 	// Open the soundscape data file, and abort if we can't
 	KeyValues *pKeyValuesData = new KeyValues( filename );
-	if ( filesystem->LoadKeyValues( *pKeyValuesData, IFileSystem::TYPE_SOUNDSCAPE, filename, "GAME" ) )
+	if ( pKeyValuesData->LoadFromFile( filesystem, filename, "GAME" ) )
 	{
 		// parse out all of the top level sections and save their names
 		KeyValues *pKeys = pKeyValuesData;
@@ -137,7 +137,7 @@ bool CSoundscapeSystem::Init()
 	}
 
 	KeyValues *manifest = new KeyValues( SOUNDSCAPE_MANIFEST_FILE );
-	if ( filesystem->LoadKeyValues( *manifest, IFileSystem::TYPE_SOUNDSCAPE, SOUNDSCAPE_MANIFEST_FILE, "GAME" ) )
+	if ( manifest->LoadFromFile( filesystem, SOUNDSCAPE_MANIFEST_FILE, "GAME" ) )
 	{
 		for ( KeyValues *sub = manifest->GetFirstSubKey(); sub != NULL; sub = sub->GetNextKey() )
 		{
diff --git a/src/lib/public/tier1.lib b/src/lib/public/tier1.lib
index c8e24b32..e1020737 100644
Binary files a/src/lib/public/tier1.lib and b/src/lib/public/tier1.lib differ
diff --git a/src/materialsystem/stdshaders/Release_dx9_openmod/game_shader_dx9.dll b/src/materialsystem/stdshaders/Release_dx9_openmod/game_shader_dx9.dll
index 3034f838..bac3a3b7 100644
Binary files a/src/materialsystem/stdshaders/Release_dx9_openmod/game_shader_dx9.dll and b/src/materialsystem/stdshaders/Release_dx9_openmod/game_shader_dx9.dll differ
diff --git a/src/tier1/strtools.cpp b/src/tier1/strtools.cpp
index 2c5f72fa..45479a73 100644
--- a/src/tier1/strtools.cpp
+++ b/src/tier1/strtools.cpp
@@ -1411,7 +1411,7 @@ int _V_UCS2ToUnicode( const ucs2 *pUCS2, wchar_t *pUnicode, int cubDestSizeInByt
 	size_t nMaxUTF8 = cubDestSizeInBytes;
 	char *pIn = (char *)pUCS2;
 	char *pOut = (char *)pUnicode;
-	if ( conv_t > 0 )
+	if ( conv_t && conv_t != ((iconv_t)-1) )
 	{
 		cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUTF8 );
 		iconv_close( conv_t );
@@ -1451,7 +1451,7 @@ int _V_UnicodeToUCS2( const wchar_t *pUnicode, int cubSrcInBytes, char *pUCS2, i
 	size_t nMaxUCS2 = cubDestSizeInBytes;
 	char *pIn = (char*)pUnicode;
 	char *pOut = pUCS2;
-	if ( conv_t > 0 )
+	if ( conv_t && conv_t != ((iconv_t)-1) )
 	{
 		cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUCS2 );
 		iconv_close( conv_t );
@@ -1499,7 +1499,7 @@ int _V_UCS2ToUTF8( const ucs2 *pUCS2, char *pUTF8, int cubDestSizeInBytes )
 	size_t nMaxUTF8 = cubDestSizeInBytes - 1;
 	char *pIn = (char *)pUCS2;
 	char *pOut = (char *)pUTF8;
-	if ( conv_t > 0 )
+	if ( conv_t && conv_t != ((iconv_t)-1) )
 	{
 		const size_t nBytesToWrite = nMaxUTF8;
 		cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUTF8 );
@@ -1544,7 +1544,7 @@ int _V_UTF8ToUCS2( const char *pUTF8, int cubSrcInBytes, ucs2 *pUCS2, int cubDes
 	size_t nMaxUTF8 = cubDestSizeInBytes;
 	char *pIn = (char *)pUTF8;
 	char *pOut = (char *)pUCS2;
-	if ( conv_t > 0 )
+	if ( conv_t && conv_t != ((iconv_t)-1) )
 	{
 		cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUTF8 );
 		iconv_close( conv_t );
@@ -2979,4 +2979,4 @@ bool BGetLocalFormattedDate( time_t timeVal, char *pchDate, int cubDate )
 bool BGetLocalFormattedTime( time_t timeVal, char *pchTime, int cubTime )
 {
 	return BGetLocalFormattedDateAndTime( timeVal, NULL, 0, pchTime, cubTime );
-}
+}
\ No newline at end of file