diff --git a/plugins/basefuncommands/fire.sp b/plugins/basefuncommands/fire.sp
index 69ffb456..b05c0220 100644
--- a/plugins/basefuncommands/fire.sp
+++ b/plugins/basefuncommands/fire.sp
@@ -134,7 +134,7 @@ public Action:Timer_FireBomb(Handle:timer, any:client)
 	new Float:vec[3];
 	GetClientEyePosition(client, vec);
 	
-	if (g_FireBombTracker[client] > 1)
+	if (g_FireBombTracker[client] > 0)
 	{
 		new color;
 		
diff --git a/plugins/basefuncommands/ice.sp b/plugins/basefuncommands/ice.sp
index c9dfc7db..2066d4a6 100644
--- a/plugins/basefuncommands/ice.sp
+++ b/plugins/basefuncommands/ice.sp
@@ -201,7 +201,7 @@ public Action:Timer_FreezeBomb(Handle:timer, any:client)
 	new Float:vec[3];
 	GetClientEyePosition(client, vec);
 	
-	if (g_FreezeBombTracker[client] > 1)
+	if (g_FreezeBombTracker[client] > 0)
 	{
 		new color;
 		
@@ -267,9 +267,6 @@ public Action:Timer_FreezeBomb(Handle:timer, any:client)
 					continue;
 				}
 				
-//stock TE_SetupBeamPoints(const Float:start[3], const Float:end[3], ModelIndex, HaloIndex, StartFrame, FrameRate, Float:Life, 
-//				Float:Width, Float:EndWidth, FadeLength, Float:Amplitude, const Color[4], Speed)
-				
 				TE_SetupBeamPoints(vec, pos, g_BeamSprite2, g_HaloSprite, 0, 1, 0.7, 20.0, 50.0, 1, 1.5, blueColor, 10);
 				TE_SendToAll();
 				
@@ -384,7 +381,7 @@ public MenuHandler_Freeze(Handle:menu, MenuAction:action, param1, param2)
 		/* Re-draw the menu if they're still valid */
 		if (IsClientInGame(param1) && !IsClientInKickQueue(param1))
 		{
-			DisplayFreezeBombMenu(param1);
+			DisplayFreezeMenu(param1);
 		}
 	}
 }
diff --git a/plugins/basefuncommands/timebomb.sp b/plugins/basefuncommands/timebomb.sp
index ac63ea84..b808b4f5 100644
--- a/plugins/basefuncommands/timebomb.sp
+++ b/plugins/basefuncommands/timebomb.sp
@@ -125,7 +125,7 @@ public Action:Timer_TimeBomb(Handle:timer, any:client)
 	new Float:vec[3];
 	GetClientEyePosition(client, vec);
 	
-	if (g_TimeBombTracker[client] > 1)
+	if (g_TimeBombTracker[client] > 0)
 	{
 		new color;