diff --git a/src/client/game_event.qc b/src/client/game_event.qc
index d6c445c..ef5ecc6 100644
--- a/src/client/game_event.qc
+++ b/src/client/game_event.qc
@@ -108,9 +108,6 @@ ClientGame_EventParse(float fHeader)
 
 		CSQC_Parse_Print(sprintf("[TEAM] %s: %s", getplayerkeyvalue(fSender2, "name"), sMessage2), PRINT_CHAT);
 		break;
-	case EV_CHAT_VOX:
-		Vox_Play(readstring());
-		break;
 	case EV_VIEWMODEL:
 		View_PlayAnimation(readbyte());
 		break;
diff --git a/src/server/client.qc b/src/server/client.qc
index b41298f..2d2363f 100644
--- a/src/server/client.qc
+++ b/src/server/client.qc
@@ -54,9 +54,9 @@ Game_ParseClientCommand(string cmd)
 		string timestring;
 		float timeleft;
 		timeleft = cvar("mp_timelimit") - (time / 60);
-		timestring = Vox_TimeToString(timeleft);
+		timestring = Util_TimeToString(timeleft);
 		msg = sprintf("we have %s minutes remaining", timestring);
-		Vox_Singlecast(self, msg);
+		bprint(PRINT_CHAT, msg);
 		return;
 	}
 
diff --git a/src/server/monster_gman.qc b/src/server/monster_gman.qc
index d1fff66..8a4d637 100644
--- a/src/server/monster_gman.qc
+++ b/src/server/monster_gman.qc
@@ -40,7 +40,7 @@ enum
 	GMAN_LOOKDOWN2
 };
 
-class monster_gman:CBaseMonster
+class monster_gman:NSTalkMonster
 {
 	void(void) monster_gman;
 
@@ -71,7 +71,7 @@ monster_gman::AnimRun(void)
 void monster_gman::Respawn(void)
 {
 	/* he can't die, he's the G-Man! */
-	CBaseMonster::Respawn();
+	super::Respawn();
 	SetFrame(GMAN_IDLE);
 	takedamage = DAMAGE_NO;
 	iBleeds = FALSE;
@@ -83,5 +83,5 @@ void monster_gman::monster_gman(void)
 	model = "models/gman.mdl";
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,72];
-	CBaseMonster::CBaseMonster();
+	super::NSTalkMonster();
 }