diff --git a/visor-core/src/main/java/org/vmstudio/visor/core/client/player/VRLocalPlayerImpl.java b/visor-core/src/main/java/org/vmstudio/visor/core/client/player/VRLocalPlayerImpl.java
index 0f44c49..860b045 100644
--- a/visor-core/src/main/java/org/vmstudio/visor/core/client/player/VRLocalPlayerImpl.java
+++ b/visor-core/src/main/java/org/vmstudio/visor/core/client/player/VRLocalPlayerImpl.java
@@ -25,7 +25,7 @@
 import org.vmstudio.visor.extensions.client.render.GameRendererExtension;
 import org.vmstudio.visor.core.client.render.VRRenderState;
 import org.vmstudio.visor.core.client.settings.VRClientSettings;
-import org.vmstudio.visor.core.client.tasks.types.movement.vehicle.TasVehicle;
+import org.vmstudio.visor.core.client.tasks.types.movement.vehicle.TaskVehicle;
 import org.vmstudio.visor.core.client.network.ClientNetworking;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.BlockPos;
@@ -317,7 +317,7 @@ public void updatePlayerLook(LocalPlayer player, PlayerPoseType stage) {
         LocalPlayerPose data = getPoseData(stage);
 
         if (player.isPassenger()) {
-            var vehicleLookDir = TasVehicle.getVehicleLookDirection(player);
+            var vehicleLookDir = TaskVehicle.getVehicleLookDirection(player);
 
             if (vehicleLookDir != null) {
                 player.setXRot((float) Math.toDegrees(
diff --git a/visor-core/src/main/java/org/vmstudio/visor/core/client/tasks/types/TaskHotBar.java b/visor-core/src/main/java/org/vmstudio/visor/core/client/tasks/types/TaskHotBar.java
index c104837..0b027c0 100644
--- a/visor-core/src/main/java/org/vmstudio/visor/core/client/tasks/types/TaskHotBar.java
+++ b/visor-core/src/main/java/org/vmstudio/visor/core/client/tasks/types/TaskHotBar.java
@@ -207,7 +207,24 @@ public void onRun(@Nullable LocalPlayer player) {
 
     @Override
     protected void onClear(@Nullable LocalPlayer player) {
+        VROverlayHotBar hotBarOffhand = (VROverlayHotBar)
+            ClientContext.overlayManager
+                .getOverlay(VROverlayHotBar.ID_OFFHAND);
+        VROverlayHotBar hotBarMainHand = (VROverlayHotBar)
+            ClientContext.overlayManager
+                .getOverlay(VROverlayHotBar.ID_MAIN);
 
+        hotBarMainHand.setEnabled(false);
+        hotBarOffhand.setEnabled(false);
+
+        inputPressedMain = false;
+        inputPressedOffhand = false;
+        pressedMain = false;
+        pressedOffhand = false;
+        previousStateMain = null;
+        previousStateOffhand = null;
+        currentStateOffhand = HotBarSlice.NOT_SELECTED;
+        resetData = true;
     }
 
     @Override
diff --git a/visor-core/src/main/java/org/vmstudio/visor/mixin/client/MinecraftMixin.java b/visor-core/src/main/java/org/vmstudio/visor/mixin/client/MinecraftMixin.java
index 1326792..5e3595a 100644
--- a/visor-core/src/main/java/org/vmstudio/visor/mixin/client/MinecraftMixin.java
+++ b/visor-core/src/main/java/org/vmstudio/visor/mixin/client/MinecraftMixin.java
@@ -9,7 +9,7 @@
 import org.vmstudio.visor.core.client.render.context.RenderContext;
 import org.vmstudio.visor.api.client.input.HandAction;
 import org.vmstudio.visor.core.client.gui.overlays.builtin.VROverlayGameScreen;
-import org.vmstudio.visor.core.client.tasks.types.movement.vehicle.TasVehicle;
+import org.vmstudio.visor.core.client.tasks.types.movement.vehicle.TaskVehicle;
 import org.vmstudio.visor.extensions.client.MinecraftExtension;
 import org.vmstudio.visor.extensions.client.entity.LocalPlayerExtension;
 import org.vmstudio.visor.core.client.render.VRRenderState;
@@ -423,9 +423,9 @@ public abstract class MinecraftMixin implements MinecraftExtension {
              }
              if (entity != this.player) {
                  // ride the new camera entity
-                 TasVehicle.getInstance().onStartRiding(entity);
+                 TaskVehicle.getInstance().onStartRiding(entity);
              } else {
-                 TasVehicle.getInstance().onStopRiding();
+                 TaskVehicle.getInstance().onStopRiding();
              }
          }
      }
diff --git a/visor-core/src/main/java/org/vmstudio/visor/mixin/client/player/LocalPlayerMixin.java b/visor-core/src/main/java/org/vmstudio/visor/mixin/client/player/LocalPlayerMixin.java
index d54fd5f..7770631 100644
--- a/visor-core/src/main/java/org/vmstudio/visor/mixin/client/player/LocalPlayerMixin.java
+++ b/visor-core/src/main/java/org/vmstudio/visor/mixin/client/player/LocalPlayerMixin.java
@@ -9,7 +9,7 @@
 import org.vmstudio.visor.core.client.VisorState;
 import org.vmstudio.visor.core.client.network.ClientNetworking;
 import org.vmstudio.visor.core.client.render.helpers.RenderPoseHelper;
-import org.vmstudio.visor.core.client.tasks.types.movement.vehicle.TasVehicle;
+import org.vmstudio.visor.core.client.tasks.types.movement.vehicle.TaskVehicle;
 import org.vmstudio.visor.mixin.common.player.Common_PlayerMixin;
 import org.vmstudio.visor.extensions.client.entity.LocalPlayerExtension;
 import org.vmstudio.visor.extensions.client.render.ItemInHandRendererExtension;
@@ -82,7 +82,7 @@ public abstract class LocalPlayerMixin extends Common_PlayerMixin implements Loc
                 || !visor$isLocalPlayer(this)) {
             return;
         }
-        TasVehicle.getInstance()
+        TaskVehicle.getInstance()
                 .onStartRiding(
                         entity
                 );
@@ -95,7 +95,7 @@ public abstract class LocalPlayerMixin extends Common_PlayerMixin implements Loc
                 || !visor$isLocalPlayer(this)) {
             return;
         }
-        TasVehicle.getInstance()
+        TaskVehicle.getInstance()
                 .onStopRiding();
     }
 
@@ -285,7 +285,7 @@ public abstract class LocalPlayerMixin extends Common_PlayerMixin implements Loc
 
         boolean shouldReset = (x + y + z) == 0;
         if (this.isPassenger()) {
-            Vec3 premountPos = TasVehicle.getInstance().premountPosRoom;
+            Vec3 premountPos = TaskVehicle.getInstance().premountPosRoom;
             premountPos = premountPos
                     .yRot(
                             ClientContext.localPlayer