diff --git a/engine/cdll_int.h b/engine/cdll_int.h
index a748eef2..345b3c84 100644
--- a/engine/cdll_int.h
+++ b/engine/cdll_int.h
@@ -285,9 +285,9 @@ typedef struct cl_enginefuncs_s
 	const char	*(*LocalPlayerInfo_ValueForKey)( const char* key );
 	int		(*pfnVGUI2DrawCharacter)( int x, int y, int ch, unsigned int font );
 	int		(*pfnVGUI2DrawCharacterAdditive)( int x, int y, int ch, int r, int g, int b, unsigned int font );
-	unsigned int	(*pfnGetApproxWavePlayLen)( char *filename );
+	unsigned int	(*pfnGetApproxWavePlayLen)( const char *filename );
 	void*		(*GetCareerGameUI)( void );	// g-cont. !!!! potential crash-point!
-	void		(*Cvar_Set)( char *name, char *value );
+	void		(*Cvar_Set)( const char *name, const char *value );
 	int		(*pfnIsPlayingCareerMatch)( void );
 	void		(*pfnPlaySoundVoiceByName)( char *szSound, float volume, int pitch );
 	void		(*pfnPrimeMusicStream)( char *filename, int looping );
diff --git a/engine/client/cl_game.c b/engine/client/cl_game.c
index e17b5555..5e8d616c 100644
--- a/engine/client/cl_game.c
+++ b/engine/client/cl_game.c
@@ -3402,7 +3402,8 @@ void GAME_EXPORT NetAPI_SendRequest( int context, int request, int flags, double
 		char	fullquery[512] = "1\xFF" "0.0.0.0:0\0" "\\gamedir\\";
 
 		// make sure what port is specified
-		if( !nr->resp.remote_address.port ) nr->resp.remote_address.port = MSG_BigShort( PORT_MASTER );
+		if( !nr->resp.remote_address.port )
+			nr->resp.remote_address.port = MSG_BigShort( PORT_MASTER );
 
 		// grab the list from the master server
 		Q_strcpy( &fullquery[22], GI->gamefolder );
@@ -3873,9 +3874,9 @@ static cl_enginefunc_t gEngfuncs =
 	LocalPlayerInfo_ValueForKey,
 	pfnVGUI2DrawCharacter,
 	pfnVGUI2DrawCharacterAdditive,
-	(void*)Sound_GetApproxWavePlayLen,
+	Sound_GetApproxWavePlayLen,
 	GetCareerGameInterface,
-	(void*)Cvar_Set,
+	Cvar_Set,
 	pfnIsCareerMatch,
 	pfnPlaySoundVoiceByName,
 	pfnMP3_InitStream,
diff --git a/engine/client/ref_common.h b/engine/client/ref_common.h
index 1e8521cb..a8ee1405 100644
--- a/engine/client/ref_common.h
+++ b/engine/client/ref_common.h
@@ -53,4 +53,6 @@ qboolean R_Init( void );
 void R_Shutdown( void );
 void R_UpdateRefState( void );
 
+extern triangleapi_t gTriApi;
+
 #endif // REF_COMMON_H
diff --git a/engine/common/cmd.c b/engine/common/cmd.c
index 7d058910..8e7b0a57 100644
--- a/engine/common/cmd.c
+++ b/engine/common/cmd.c
@@ -545,7 +545,7 @@ cmd_t *GAME_EXPORT Cmd_GetNextFunctionHandle( cmd_t *cmd )
 Cmd_GetName
 ============
 */
-char *GAME_EXPORT Cmd_GetName( cmd_t *cmd )
+const char *GAME_EXPORT Cmd_GetName( cmd_t *cmd )
 {
 	return cmd->name;
 }
diff --git a/engine/common/common.h b/engine/common/common.h
index c3af0c9b..163442bf 100644
--- a/engine/common/common.h
+++ b/engine/common/common.h
@@ -858,7 +858,7 @@ int COM_ExpandFilename( const char *fileName, char *nameOutBuffer, int nameOutBu
 struct cmd_s *Cmd_GetFirstFunctionHandle( void );
 struct cmd_s *Cmd_GetNextFunctionHandle( struct cmd_s *cmd );
 struct cmdalias_s *Cmd_AliasGetList( void );
-char *Cmd_GetName( struct cmd_s *cmd );
+const char *Cmd_GetName( struct cmd_s *cmd );
 struct pmtrace_s *PM_TraceLine( float *start, float *end, int flags, int usehull, int ignore_pe );
 void SV_StartSound( edict_t *ent, int chan, const char *sample, float vol, float attn, int flags, int pitch );
 void SV_StartMusic( const char *curtrack, const char *looptrack, int position );