diff --git a/src/server/entry.qc b/src/server/entry.qc
index da7cf5b6..a8c9a869 100644
--- a/src/server/entry.qc
+++ b/src/server/entry.qc
@@ -418,6 +418,10 @@ initents(void)
 	Sound_Precache("player.waterexit");
 	Sound_Precache("damage_bullet.hit");
 	Sound_Precache("player.spraylogo");
+	Sound_Precache("step_wade.left");
+	Sound_Precache("step_wade.right");
+	Sound_Precache("step_ladder.left");
+	Sound_Precache("step_ladder.right");
 
 	if (!g_grMode)
 		Game_InitRules();
diff --git a/src/shared/defs.h b/src/shared/defs.h
index b66ce70f..6a1aacd2 100644
--- a/src/shared/defs.h
+++ b/src/shared/defs.h
@@ -102,7 +102,7 @@ string __fullspawndata;
 #define BSPVER_RTCW		47
 #define BSPVER_RBSP 	1
 
-#define CLASSEXPORT(classname,classa) void classname(void) { spawnfunc_##classa(); }
+#define CLASSEXPORT(a,b) void a(void) { if (!isfunction(#b)) { self.classname = strcat("spawnfunc_", #b); } else { self.classname = #b; } callfunction(self.classname); }
 
 #define printf(x, ...) print(sprintf(x, ...))