diff --git a/metamod/include/engine/archtypes.h b/metamod/include/engine/archtypes.h
index e528a6d..d7bc505 100644
--- a/metamod/include/engine/archtypes.h
+++ b/metamod/include/engine/archtypes.h
@@ -24,13 +24,10 @@
 *    you do not wish to do so, delete this exception statement from your
 *    version.
 *
-*/#ifndef ARCHTYPES_H
+*/
+#ifndef ARCHTYPES_H
 #define ARCHTYPES_H
 
-#ifdef __x86_64__
-#define X64BITS
-#endif
-
 #if defined( _WIN32 ) && (! defined( __MINGW32__ ))
 
 typedef __int8 int8;
diff --git a/metamod/msvc/metamod.def b/metamod/msvc/metamod.def
index 9e13bbf..b62aafb 100644
--- a/metamod/msvc/metamod.def
+++ b/metamod/msvc/metamod.def
@@ -1,4 +1,4 @@
-LIBRARY metamod_mm
+LIBRARY metamod
 EXPORTS
 	GiveFnptrsToDll			@1
 SECTIONS
diff --git a/metamod/src/callback_jit.cpp b/metamod/src/callback_jit.cpp
index 8fd3f33..fe3767a 100644
--- a/metamod/src/callback_jit.cpp
+++ b/metamod/src/callback_jit.cpp
@@ -25,7 +25,7 @@ class CForwardCallbackJIT : public jitasm::function<int, CForwardCallbackJIT, in
 {
 public:
 	CForwardCallbackJIT(jitdata_t *jitdata);
-	void naked_main() override;
+	void naked_main();
 	void call_func(jitasm::Frontend::Reg32 addr);
 
 private:
diff --git a/metamod/src/engine_api.cpp b/metamod/src/engine_api.cpp
index 702a26d..e656923 100644
--- a/metamod/src/engine_api.cpp
+++ b/metamod/src/engine_api.cpp
@@ -11,11 +11,10 @@ void mm_QueryClientCvarValue(const edict_t* pEdict, const char* cvarName)
 	g_players.set_player_cvar_query(pEdict, cvarName);
 }
 
+// int -> void
 void mm_RegUserMsg(const char* pszName, int iSize)
 {
-	/*__asm int 3;
-	// Add the msgid, name, and size to our saved list, if we haven't
-	// already.
+	// Add the msgid, name, and size to our saved list, if we haven't already.
 	auto imsgid = *(int *)(g_metaGlobals.status == MRES_OVERRIDE ? g_metaGlobals.override_ret : g_metaGlobals.orig_ret);
 	auto nmsg = g_regMsgs->find(imsgid);
 	
@@ -28,7 +27,7 @@ void mm_RegUserMsg(const char* pszName, int iSize)
 			META_ERROR("user message id reused: msgid=%d, oldname=%s, newname=%s", imsgid, nmsg->name, pszName);
 	}
 	else
-		g_regMsgs->add(pszName, imsgid, iSize);*/
+		g_regMsgs->add(pszName, imsgid, iSize);
 }
 
 compile_data_t g_engfuncs_cdata[] =
diff --git a/metamod/src/jitasm.h b/metamod/src/jitasm.h
index a78f427..f74840d 100644
--- a/metamod/src/jitasm.h
+++ b/metamod/src/jitasm.h
@@ -8887,8 +8887,7 @@ struct function_cdecl<R, Derived, A1, detail::ArgNone, detail::ArgNone, detail::
 	typename detail::ResultTraits<R>::ResultPtr result_ptr;
 	operator FuncPtr() { return (FuncPtr)GetCode(); }
 	void InternalMain() {static_cast<Derived *>(this)->naked_main();}
-
-	virtual void naked_main() {
+	void naked_main() {
 		using namespace detail::calling_convention_cdecl;
 		Prolog();
 		detail::ResultDest result_dst(*this, ResultInfo<R>());