diff --git a/planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/clonkAlchemist.skeleton b/planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/clonkAlchemist.skeleton
index be5fc296a..1a2b24975 100644
Binary files a/planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/clonkAlchemist.skeleton and b/planet/Objects.ocd/Clonk.ocd/Alchemist.ocd/clonkAlchemist.skeleton differ
diff --git a/planet/Objects.ocd/Clonk.ocd/Clonk.skeleton b/planet/Objects.ocd/Clonk.ocd/Clonk.skeleton
index 22359b213..1a2b24975 100644
Binary files a/planet/Objects.ocd/Clonk.ocd/Clonk.skeleton and b/planet/Objects.ocd/Clonk.ocd/Clonk.skeleton differ
diff --git a/planet/Objects.ocd/Clonk.ocd/Script.c b/planet/Objects.ocd/Clonk.ocd/Script.c
index 0f5e0da2c..03a5bdcf6 100644
--- a/planet/Objects.ocd/Clonk.ocd/Script.c
+++ b/planet/Objects.ocd/Clonk.ocd/Script.c
@@ -844,7 +844,7 @@ func FxIntWalkTimer(pTarget, effect)
 {
 
 	// Test Waterlevel
-	if(GBackLiquid(0, -5))
+	if(GBackLiquid(0, -5) && !Contained())
 	{
 		SetAction("Swim");
 		if(GetComDir() == COMD_Left)
diff --git a/planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/Steampunk.skeleton b/planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/Steampunk.skeleton
index 435e82ffd..1a2b24975 100644
Binary files a/planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/Steampunk.skeleton and b/planet/Objects.ocd/Clonk.ocd/Steampunk.ocd/Steampunk.skeleton differ
diff --git a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c
index e19ed48e3..4795d1bbf 100644
--- a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c
+++ b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c
@@ -330,6 +330,7 @@ public func ActivateEntrance(object clonk)
 		clonk->Enter(this);
 		clonk->SetAction("Walk");
 		PlaneMount(clonk);
+		clonk->PlayAnimation("Drive", 5, Anim_Const(10), Anim_Const(1000));
 	}
 }