diff --git a/core/AdminCache.cpp b/core/AdminCache.cpp
index 6537bc6b..b03f3110 100644
--- a/core/AdminCache.cpp
+++ b/core/AdminCache.cpp
@@ -1109,7 +1109,7 @@ unsigned int AdminCache::FlagBitsToBitArray(FlagBits bits, bool array[], unsigne
 	unsigned int i;
 	for (i=0; i<maxSize && i<AdminFlags_TOTAL; i++)
 	{
-		array[i] = ((bits & (1<<i)) == (1<<i));
+		array[i] = ((bits & (1<<i)) == (unsigned)(1<<i));
 	}
 
 	return i;
@@ -1145,7 +1145,7 @@ unsigned int AdminCache::FlagBitsToArray(FlagBits bits, AdminFlag array[], unsig
 	unsigned int i, num=0;
 	for (i=0; i<maxSize && i<AdminFlags_TOTAL; i++)
 	{
-		if ((bits & (1<<i)) == (1<<i))
+		if ((bits & (1<<i)) == (unsigned)(1<<i))
 		{
 			array[num++] = (AdminFlag)i;
 		}
diff --git a/core/CConVarManager.h b/core/CConVarManager.h
index e3574932..6ca9bae7 100644
--- a/core/CConVarManager.h
+++ b/core/CConVarManager.h
@@ -51,4 +51,5 @@ private:
 
 extern CConVarManager g_ConVarManager;
 
-#endif // _INCLUDE_SOURCEMOD_CCONVARMANAGER_H_
\ No newline at end of file
+#endif // _INCLUDE_SOURCEMOD_CCONVARMANAGER_H_
+
diff --git a/core/CPlayerManager.cpp b/core/CPlayerManager.cpp
index 052c709c..69f70bd9 100644
--- a/core/CPlayerManager.cpp
+++ b/core/CPlayerManager.cpp
@@ -292,7 +292,7 @@ void CPlayerManager::OnClientDisconnect(edict_t *pEntity)
 	{
 		for (unsigned int i=1; i<=m_AuthQueue[0]; i++)
 		{
-			if (m_AuthQueue[i] == client)
+			if (m_AuthQueue[i] == (unsigned)client)
 			{
 				/* Move everything ahead of us back by one */
 				for (unsigned int j=i+1; j<=m_AuthQueue[0]; j++)
diff --git a/core/Makefile b/core/Makefile
index 625c7b0b..b1576f89 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -20,10 +20,10 @@ HL2PUB = $(HL2SDK)/public
 HL2LIB = $(HL2SDK)/linux_sdk
 
 OBJECTS = sourcemm_api.cpp sourcemod.cpp AdminCache.cpp CDbgReporter.cpp CLogger.cpp \
-	  CPlayer.cpp CPlayerManager.cpp CTextParsers.cpp CTranslator.cpp \
+	  CPlayerManager.cpp CTextParsers.cpp CTranslator.cpp \
 	  sm_autonatives.cpp sm_memtable.cpp sm_srvcmds.cpp sm_trie.cpp \
 	  sm_stringutil.cpp smn_filesystem.cpp smn_float.cpp smn_handles.cpp \
-	  smn_player.cpp smn_string.cpp smn_textparse.cpp \
+	  smn_player.cpp smn_string.cpp smn_textparse.cpp smn_convar.cpp smn_admin.cpp \
 	  systems/ExtensionSys.cpp systems/ForwardSys.cpp systems/HandleSys.cpp \
 	  systems/LibrarySys.cpp systems/PluginInfoDatabase.cpp \
 	  systems/PluginSys.cpp systems/ShareSys.cpp vm/sp_vm_basecontext.cpp \
diff --git a/core/sm_stringutil.cpp b/core/sm_stringutil.cpp
index f544704c..b8c3d764 100644
--- a/core/sm_stringutil.cpp
+++ b/core/sm_stringutil.cpp
@@ -62,6 +62,11 @@ size_t Translate(char *buffer, size_t maxlen, IPluginContext *pCtx, const char *
 	unsigned int langid;
 	char *langname = NULL;
 	*error = false;
+	Translation pTrans;
+	CPlugin *pl = (CPlugin *)g_PluginSys.FindPluginByContext(pCtx->GetContext());
+	size_t langcount = pl->GetLangFileCount();
+	void *new_params[MAX_TRANSLATE_PARAMS];
+	unsigned int max_params = 0;
 
 try_serverlang:
 	if (target == LANG_SERVER)
@@ -89,9 +94,7 @@ try_serverlang:
 		goto error_out;
 	}
 
-	Translation pTrans;
-	CPlugin *pl = (CPlugin *)g_PluginSys.FindPluginByContext(pCtx->GetContext());
-	size_t langcount = pl->GetLangFileCount();
+	max_params = pTrans.fmt_count;
 
 	if (!TryTranslation(pl, key, langid, langcount, &pTrans))
 	{
@@ -109,8 +112,6 @@ try_serverlang:
 		}
 	}
 
-	void *new_params[MAX_TRANSLATE_PARAMS];
-	unsigned int max_params = pTrans.fmt_count;
 	for (size_t i=0; i<max_params; i++)
 	{
 		pCtx->LocalToPhysAddr(params[*arg], reinterpret_cast<cell_t **>(&new_params[i]));
diff --git a/core/smn_float.cpp b/core/smn_float.cpp
index e54fd80b..4a8e8c34 100644
--- a/core/smn_float.cpp
+++ b/core/smn_float.cpp
@@ -12,6 +12,8 @@
  */
 
 #include <math.h>
+#include <string.h>
+#include <stdlib.h>
 #include "sm_globals.h"
 
 /****************************************
diff --git a/core/smn_player.cpp b/core/smn_player.cpp
index df86366a..fa6da607 100644
--- a/core/smn_player.cpp
+++ b/core/smn_player.cpp
@@ -406,6 +406,7 @@ REGISTER_NATIVES(playernatives)
 	{"PrintToConsole",			sm_PrintToConsole},
 	{"GetClientInfo",			sm_GetClientInfo},
 	{"SetUserAdmin",			SetUserAdmin},
+	{"GetUserAdmin",			GetUserAdmin},
 	{"AddUserFlags",			AddUserFlags},
 	{"RemoveUserFlags",			RemoveUserFlags},
 	{"SetUserFlagBits",			SetUserFlagBits},
diff --git a/core/svn_version.h b/core/svn_version.h
index 75ccd495..97147a48 100644
--- a/core/svn_version.h
+++ b/core/svn_version.h
@@ -1,11 +1,11 @@
-/** This file is autogenerated by build scripts */
-
-#ifndef _INCLUDE_SVN_VERSION_H_
-#define _INCLUDE_SVN_VERSION_H_
-
-#define SVN_REVISION			429
-#define SVN_REVISION_STRING	"429"
-#define SVN_FILE_VERSION		1,0,0,429
-
-#endif //_INCLUDE_SVN_VERSION_H_
-
+/** This file is autogenerated by build scripts */
+
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+#define SVN_REVISION			468
+#define SVN_REVISION_STRING	"468"
+#define SVN_FILE_VERSION		1,0,0,468
+
+#endif //_INCLUDE_SVN_VERSION_H_
+
diff --git a/core/systems/ForwardSys.h b/core/systems/ForwardSys.h
index e8e16ae7..db283fde 100644
--- a/core/systems/ForwardSys.h
+++ b/core/systems/ForwardSys.h
@@ -84,7 +84,7 @@ protected:
 	/* :TODO: I want a caching list type here.
 	 * Destroying these things and using new/delete for their members feels bad.
 	 */
-	List<IPluginFunction *> m_functions;
+	mutable List<IPluginFunction *> m_functions;
 	List<IPluginFunction *> m_paused;
 
 	/* Type and name information */
diff --git a/core/systems/PluginSys.cpp b/core/systems/PluginSys.cpp
index 6699cf26..e1761185 100644
--- a/core/systems/PluginSys.cpp
+++ b/core/systems/PluginSys.cpp
@@ -1658,4 +1658,5 @@ void CPluginManager::_SetPauseState(CPlugin *pl, bool paused)
 		pListener = (*iter);
 		pListener->OnPluginPauseChange(pl, paused);
 	}	
-}
\ No newline at end of file
+}
+