diff --git a/lib/linux/tier1_i486.a b/lib/linux/tier1_i486.a
index c8077cfc..8f3dc590 100644
Binary files a/lib/linux/tier1_i486.a and b/lib/linux/tier1_i486.a differ
diff --git a/lib/mac/tier1_i486.a b/lib/mac/tier1_i486.a
index 2cf648d0..9bd9f84e 100644
Binary files a/lib/mac/tier1_i486.a and b/lib/mac/tier1_i486.a differ
diff --git a/lib/public/tier1.lib b/lib/public/tier1.lib
index 1bdcf949..b5b42ec1 100644
Binary files a/lib/public/tier1.lib and b/lib/public/tier1.lib differ
diff --git a/public/tier0/threadtools.h b/public/tier0/threadtools.h
index abb36908..876f3a0e 100644
--- a/public/tier0/threadtools.h
+++ b/public/tier0/threadtools.h
@@ -890,8 +890,13 @@ template <> struct CAutoLockTypeDeducer<sizeof(CAlignedThreadFastMutex)> {	typed
 #define AUTO_LOCK_( type, mutex ) \
 	CAutoLockT< type > UNIQUE_ID( static_cast<const type &>( mutex ) )
 
+#ifdef COMPILER_GCC
 #define AUTO_LOCK( mutex ) \
 	AUTO_LOCK_( typeof(CAutoLockTypeDeducer<sizeof(mutex)>::Type_t), mutex )
+#else
+#define AUTO_LOCK( mutex ) \
+	AUTO_LOCK_( CAutoLockTypeDeducer<sizeof(mutex)>::Type_t, mutex )
+#endif
 
 
 #define AUTO_LOCK_FM( mutex ) \
diff --git a/public/tier1/convar.h b/public/tier1/convar.h
index 29fddb72..8e800fab 100644
--- a/public/tier1/convar.h
+++ b/public/tier1/convar.h
@@ -371,8 +371,8 @@ public:
 	FnChangeCallback_t GetChangeCallback( int slot ) const { return m_pParent->m_fnChangeCallbacks[ slot ]; }
 
 	// Retrieve value
-	FORCEINLINE_CVAR float			GetFloat( void ) const;
-	FORCEINLINE_CVAR int			GetInt( void ) const;
+	virtual float				GetFloat( void ) const;
+	virtual int				GetInt( void ) const;
 	FORCEINLINE_CVAR Color			GetColor( void ) const;
 	FORCEINLINE_CVAR bool			GetBool() const {  return !!GetInt(); }
 	FORCEINLINE_CVAR char const	   *GetString( void ) const;