diff --git a/src/karyuu/client.inc b/src/karyuu/client.inc
index e7a7929..7e7b0a9 100644
--- a/src/karyuu/client.inc
+++ b/src/karyuu/client.inc
@@ -6,8 +6,8 @@
 #define MAX_AUTH_LENGTH			  21
 #define MAX_IP_LENGTH 				23
 
-#define KARYUU_LOOP_CLIENTS(%1) for (int %1 = 0; %1 <= MAXPLAYERS + 1; %1++) if (Karyuu_IsValidClient(%1))
-#define KARYUU_LOOP_PLAYERS(%1) for (int %1 = 0; %1 <= MAXPLAYERS + 1; %1++) if (Karyuu_IsValidPlayer(%1))
+#define KARYUU_LOOP_CLIENTS(%1) for (int %1 = 1; %1 <= MAXPLAYERS + 1; %1++) if (IsClientInGame(%1))
+#define KARYUU_LOOP_PLAYERS(%1) for (int %1 = 1; %1 <= MAXPLAYERS + 1; %1++) if (IsClientInGame(%1) && !IsFakeClient(%1))
 
 enum WaterLevel
 {
diff --git a/src/karyuu/game/game.inc b/src/karyuu/game/game.inc
index 0ba160a..3005c71 100644
--- a/src/karyuu/game/game.inc
+++ b/src/karyuu/game/game.inc
@@ -141,7 +141,7 @@ stock bool Karyuu_IsWarmUpPeriod()
 
 stock float Karyuu_WarmupTimeLeft()
 {
-	return GameRules_GetProp("m_fWarmupPeriodEnd");
+	return GameRules_GetPropFloat("m_fWarmupPeriodEnd");
 }
 
 stock bool Karyuu_IsOvertime()
diff --git a/src/karyuu/variable/random.inc b/src/karyuu/variable/random.inc
index 29f1694..35805af 100644
--- a/src/karyuu/variable/random.inc
+++ b/src/karyuu/variable/random.inc
@@ -15,15 +15,10 @@ stock bool Karyuu_RandomBool()
 
 stock int Karyuu_RandomInt(int iMin, int iMax)
 {
-	int iRandom = GetURandomInt();
-
-	if (iRandom == 0)
-		iRandom++;
-
-	return RoundToCeil(float(iRandom) / (float(MAX_INTEGER_VALUE) / float(iMax - iMin + 1))) + iMin - 1;
+	return RoundToZero(Karyuu_RandomFloat(float(iMin), float(iMax)));
 }
 
-stock float Karyuu_RandomFloat(float min, float max)
+stock float Karyuu_RandomFloat(float iMin, float iMax)
 {
-	return (GetURandomFloat() * (max - min)) + min;
+	return GetURandomFloat() * (iMax - iMin + 1) + iMin;
 }
\ No newline at end of file