diff --git a/regamedll/dlls/vehicle.cpp b/regamedll/dlls/vehicle.cpp
index ffd0bc55..3089c916 100644
--- a/regamedll/dlls/vehicle.cpp
+++ b/regamedll/dlls/vehicle.cpp
@@ -150,7 +150,7 @@ void CFuncVehicle::Blocked(CBaseEntity *pOther)
 		if (pOther->Classify() == CLASS_PLAYER)
 		{
 			CBasePlayer* playerOther = static_cast<CBasePlayer*>(pOther);
-			if (!playerDriver || (!friendlyfire.value && playerDriver->m_iTeam == playerOther->m_iTeam))
+			if (!playerDriver || g_pGameRules->PlayerRelationship(playerDriver, playerOther) == GR_TEAMMATE)
 			{
 				// Just kick player
 				return;
diff --git a/regamedll/dlls/weapons.cpp b/regamedll/dlls/weapons.cpp
index 22d61fc9..2d2b5afc 100644
--- a/regamedll/dlls/weapons.cpp
+++ b/regamedll/dlls/weapons.cpp
@@ -70,6 +70,8 @@ float GetBaseAccuracy(WeaponIdType id)
 	case WEAPON_MP5N:
 		return 0.0f;
 	}
+
+	return 0.0f;
 }
 
 // Resets the global multi damage accumulator