diff --git a/src/k_kart.c b/src/k_kart.c
index bd2988162..0cfd3bce0 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2720,7 +2720,7 @@ boolean K_WaterRun(player_t *player)
 
 boolean K_WaterSkip(player_t *player)
 {
-	if (player->waterskip >= 2)
+	if (player->waterskip > 2)
 	{
 		// Already finished waterskipping.
 		return false;
@@ -4741,7 +4741,7 @@ void K_DoWaterRunPanel(player_t *player)
 		K_FlipFromObject(overlay, player->mo);
 	}
 	
-	player->sneakertimer = sneakertime;
+	player->sneakertimer = TICRATE*2;
 	player->waterrun = true;
 
 	// set angle for spun out players:
diff --git a/src/k_terrain.c b/src/k_terrain.c
index 47362adf6..97b9a467d 100644
--- a/src/k_terrain.c
+++ b/src/k_terrain.c
@@ -531,7 +531,7 @@ void K_ProcessTerrainEffect(mobj_t *mo)
 		else
 			player->floorboost = 2;
 
-		K_DoSneaker(player, 0);
+		K_DoWaterRunPanel(player);
 	}
 	
 	// Speed pad
@@ -1652,7 +1652,7 @@ static void K_ParseTerrainParameter(size_t i, char *param, char *val)
 	{
 		K_FlagBoolean(&terrain->flags, TRF_SNEAKERPANEL, val);
 	}
-	else if (stricmp(param, "waterRunPanel") == 0)
+	else if (stricmp(param, "waterRunPanel") == 0 || stricmp(param, "waterPanel") == 0)
 	{
 		K_FlagBoolean(&terrain->flags, TRF_WATERRUNPANEL, val);
 	}