diff --git a/core/concmd_cleaner.cpp b/core/concmd_cleaner.cpp
index da3ce6a0..323f4513 100644
--- a/core/concmd_cleaner.cpp
+++ b/core/concmd_cleaner.cpp
@@ -99,7 +99,7 @@ public:
 				{
 					pInfo = (*iter);
 					iter = tracked_bases.erase(iter);
-					pInfo->cls->OnUnlinkConCommandBase(pBase, pBase->GetName(), true);
+					pInfo->cls->OnUnlinkConCommandBase(pBase, pInfo->name, true);
 					delete pInfo;
 				}
 				else
diff --git a/core/sourcemm_api.cpp b/core/sourcemm_api.cpp
index bfc4504d..3ac89de7 100644
--- a/core/sourcemm_api.cpp
+++ b/core/sourcemm_api.cpp
@@ -34,6 +34,7 @@
 #include "sm_version.h"
 #include "Logger.h"
 #include "concmd_cleaner.h"
+#include "compat_wrappers.h"
 
 SourceMod_Core g_SourceMod_Core;
 IVEngineServer *engine = NULL;