diff --git a/src/cache.h b/src/cache.h
index cd832bb..9edc9c0 100644
--- a/src/cache.h
+++ b/src/cache.h
@@ -877,7 +877,7 @@ struct WaterCache {
     }
 
     void simulate() {
-       PROFILE_MARKER("WATER_SIMULATE");
+        PROFILE_MARKER("WATER_SIMULATE");
     // simulate water
         Core::setDepthTest(false);
         Core::setBlendMode(bmNone);
diff --git a/src/format.h b/src/format.h
index 0577ba8..7756716 100644
--- a/src/format.h
+++ b/src/format.h
@@ -895,7 +895,6 @@ namespace TR {
             DRAW_LEFTGUN   ,
             SHOT_RIGHTGUN  ,
             SHOT_LEFTGUN   ,
-            UNKNOWN        ,
             MESH_SWAP_1    ,
             MESH_SWAP_2    ,
             MESH_SWAP_3    ,
diff --git a/src/lara.h b/src/lara.h
index ade4ea4..cb1e21d 100644
--- a/src/lara.h
+++ b/src/lara.h
@@ -1528,6 +1528,7 @@ struct Lara : Character {
     }
 
     void drawGun(int right) {
+        wpnCurrent = TR::Entity::PISTOLS;
         int mask = (right ? JOINT_MASK_ARM_R3 : JOINT_MASK_ARM_L3); // unholster
         if (layers[1].mask & mask)
             mask = (layers[1].mask & ~mask) | (right ? JOINT_MASK_LEG_R1 : JOINT_MASK_LEG_L1); // holster