diff --git a/core/EventManager.cpp b/core/EventManager.cpp
index 13561e5a..35a1b33b 100644
--- a/core/EventManager.cpp
+++ b/core/EventManager.cpp
@@ -369,7 +369,7 @@ bool EventManager::OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast)
 {
 	EventHook *pHook;
 	IChangeableForward *pForward;
-	Handle_t hndl;
+	Handle_t hndl = 0;
 
 	if (!m_NotifyPlugins)
 	{
diff --git a/core/Makefile b/core/Makefile
index d9669fb5..2cbb9229 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -19,16 +19,19 @@ BINARY = sourcemod_mm_i486.so
 HL2PUB = $(HL2SDK)/public
 HL2LIB = $(HL2SDK)/linux_sdk
 
-OBJECTS = sourcemm_api.cpp sourcemod.cpp AdminCache.cpp ConVarManager.cpp CDataPack.cpp \
-          DebugReporter.cpp Logger.cpp PlayerManager.cpp TextParsers.cpp Translator.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_console.cpp smn_admin.cpp \
-	  smn_datapacks.cpp smn_lang.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 \
-	  vm/sp_vm_engine.cpp vm/sp_vm_function.cpp ConCmdManager.cpp TimerSys.cpp 
+OBJECTS = AdminCache.cpp CDataPack.cpp ConCmdManager.cpp ConVarManager.cpp \
+	DebugReporter.cpp EventManager.cpp GameConfigs.cpp HalfLife2.cpp Logger.cpp \
+	PlayerManager.cpp TextParsers.cpp TimerSys.cpp Translator.cpp UserMessages.cpp \
+	sm_autonatives.cpp sm_memtable.cpp sm_srvcmds.cpp sm_stringutil.cpp sm_trie.cpp \
+	sourcemm_api.cpp sourcemod.cpp
+OBJECTS += smn_admin.cpp smn_bitbuffer.cpp smn_console.cpp smn_core.cpp \
+	smn_datapacks.cpp smn_entities.cpp smn_events.cpp smn_fakenatives.cpp \
+	smn_filesystem.cpp smn_float.cpp smn_halflife.cpp smn_handles.cpp smn_lang.cpp \
+	smn_player.cpp smn_sorting.cpp smn_textparse.cpp smn_usermsgs.cpp
+OBJECTS += 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 vm/sp_vm_engine.cpp \
+	  vm/sp_vm_function.cpp 
 OBJECTS_C = zlib/adler32.c zlib/compress.c zlib/crc32.c zlib/deflate.c zlib/gzio.c \
 	   zlib/infback.c zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \
 	   zlib/uncompr.c zlib/zutil.c
diff --git a/core/smn_entities.cpp b/core/smn_entities.cpp
index d38d1325..2e346f81 100644
--- a/core/smn_entities.cpp
+++ b/core/smn_entities.cpp
@@ -516,6 +516,7 @@ REGISTER_NATIVES(entityNatives)
 	{"GetEntDataEnt",			GetEntDataEnt},
 	{"GetEntDataFloat",			GetEntDataFloat},
 	{"GetEntDataVector",		GetEntDataVector},
+	{"GetEntityCount",			GetEntityCount},
 	{"GetEntityNetClass",		GetEntityNetClass},
 	{"GetMaxEntities",			GetMaxEntities},
 	{"IsEntNetworkable",		IsEntNetworkable},
diff --git a/core/smn_sorting.cpp b/core/smn_sorting.cpp
index 4807598b..b181cb52 100644
--- a/core/smn_sorting.cpp
+++ b/core/smn_sorting.cpp
@@ -14,6 +14,7 @@
 #include "sm_globals.h"
 #include <IHandleSys.h>
 #include <stdlib.h>
+#include <string.h>
 
 /***********************************
  *   About the double array hack   *