diff --git a/game/client/hud_controlpointicons.h b/game/client/hud_controlpointicons.h
index c660ca73..f4667ae1 100644
--- a/game/client/hud_controlpointicons.h
+++ b/game/client/hud_controlpointicons.h
@@ -345,7 +345,11 @@ private:
 	bool							m_bCachedCountdownState;
 	CControlPointCountdown			*m_pCountdown;
 
+#if defined( TF_MOD_CLIENT )
+	DHANDLE< CTFLabel >				m_pCPTimerLabel; // used to display CCPTimerLogic countdowns
+#else
 	DHANDLE< CExLabel >				m_pCPTimerLabel; // used to display CCPTimerLogic countdowns
+#endif
 	DHANDLE< vgui::ImagePanel >		m_pCPTimerBG; // used to display CCPTimerLogic countdowns
 	float							m_flCPTimerTime;
 	bool							m_bRedText;
diff --git a/game/client/tf2base/c_tf_player.cpp b/game/client/tf2base/c_tf_player.cpp
index 25d08071..4b829a80 100644
--- a/game/client/tf2base/c_tf_player.cpp
+++ b/game/client/tf2base/c_tf_player.cpp
@@ -610,7 +610,7 @@ void C_TFRagdoll::ClientThink( void )
 		int iAlpha = GetRenderColor().a;
 		int iFadeSpeed = 600.0f;
 
-		iAlpha = max( iAlpha - ( iFadeSpeed * gpGlobals->frametime ), 0 );
+		iAlpha = MAX( iAlpha - ( iFadeSpeed * gpGlobals->frametime ), 0 );
 
 		SetRenderMode( kRenderTransAlpha );
 		SetRenderColorA( iAlpha );
@@ -1267,7 +1267,7 @@ void C_TFPlayer::OnDataChanged( DataUpdateType_t updateType )
 	
 	if ( m_bDisguised != m_Shared.InCond( TF_COND_DISGUISED ) )
 	{
-		m_flDisguiseEndEffectStartTime = max( m_flDisguiseEndEffectStartTime, gpGlobals->curtime );
+		m_flDisguiseEndEffectStartTime = MAX( m_flDisguiseEndEffectStartTime, gpGlobals->curtime );
 	}
 
 	int nNewWaterLevel = GetWaterLevel();
@@ -2227,7 +2227,7 @@ void C_TFPlayer::AvoidPlayers( CUserCmd *pCmd )
 		flSideScale = fabs( cl_sidespeed.GetFloat() ) / fabs( pCmd->sidemove );
 	}
 
-	float flScale = min( flForwardScale, flSideScale );
+	float flScale = MIN( flForwardScale, flSideScale );
 	pCmd->forwardmove *= flScale;
 	pCmd->sidemove *= flScale;