diff --git a/src/hacks/ESP.cpp b/src/hacks/ESP.cpp
index 1e16e876..922c6d38 100644
--- a/src/hacks/ESP.cpp
+++ b/src/hacks/ESP.cpp
@@ -25,7 +25,6 @@ CatEnum tracers_enum({ "OFF", "CENTER", "BOTTOM" });
 CatVar tracers(tracers_enum, "esp_tracers", "0", "Tracers",
                "SDraws a line from the player to a position on your screen");
 // Emoji Esp
-#ifndef FEATURE_EMOJI_ESP_DISABLED
 CatEnum emoji_esp_enum({ "None", "Joy", "Thinking" });
 CatVar emoji_esp(emoji_esp_enum, "esp_emoji", "0", "Emoji ESP",
                  "Draw emoji on peopels head");
@@ -37,8 +36,8 @@ CatVar emoji_esp_scaling(CV_SWITCH, "esp_emoji_scaling", "1",
                          "Emoji ESP Scaling", "Emoji ESP Scaling");
 CatVar emoji_min_size(CV_INT, "esp_emoji_min_size", "20", "Emoji ESP min size",
                       "Minimum size for an emoji when you use auto scaling");
+
 hitbox_cache::CachedHitbox *hitboxcache[32][18]{};
-#endif
 // Other esp options
 CatEnum show_health_enum({ "None", "Text", "Healthbar", "Both" });
 CatVar show_health(show_health_enum, "esp_health", "3", "Health ESP",
diff --git a/src/hacks/LagExploit.cpp b/src/hacks/LagExploit.cpp
index b27c92d2..ef9a1cce 100644
--- a/src/hacks/LagExploit.cpp
+++ b/src/hacks/LagExploit.cpp
@@ -73,6 +73,7 @@ static CatVar infinite_packs(CV_SWITCH, "infinite_packs", "0",
                              "Activate sequence exploit when standing on "
                              "pickups while having not full HP/Ammo");
 float servertime, nextattack;
+static int lastwep = 0;
 void CreateMove()
 {
     if (CE_BAD(LOCAL_E))
@@ -293,14 +294,6 @@ void CreateMove()
             }
         }
     }
-    if (instant_weapon_switch && not HasCondition<TFCond_Cloaked>(LOCAL_E))
-    {
-        static int lastweapon = 0;
-        if (lastweapon != g_pUserCmd->weaponselect) {
-            amount = 2 * 90;
-            lastweapon = g_pUserCmd->weaponselect;
-        }
-    }
     if (cloak && shoot)
     {
 
@@ -398,6 +391,14 @@ void CreateMove()
             }
         }
     }
+    if (instant_weapon_switch && not HasCondition<TFCond_Cloaked>(LOCAL_E))
+    {
+        if (lastwep != g_pLocalPlayer->weapon()->m_IDX)
+        {
+            amount  = 2 * 90;
+            lastwep = g_pLocalPlayer->weapon()->m_IDX;
+        }
+    }
     // SHOUTOUTS TO BLACKFIRE
     if (doom || razorback)
     {
@@ -405,7 +406,6 @@ void CreateMove()
         servertime =
             (float) (CE_INT(g_pLocalPlayer->entity, netvar.nTickBase)) *
             g_GlobalVars->interval_per_tick;
-        static int lastwep = g_pLocalPlayer->weapon()->m_IDX;
         if (!nextattack || !i || g_pLocalPlayer->weapon()->m_IDX != lastwep)
             nextattack =
                 CE_FLOAT(g_pLocalPlayer->weapon(), netvar.flNextPrimaryAttack);
diff --git a/src/menu/ncc/ItemVariable.cpp b/src/menu/ncc/ItemVariable.cpp
index f49df89b..92edb8cd 100644
--- a/src/menu/ncc/ItemVariable.cpp
+++ b/src/menu/ncc/ItemVariable.cpp
@@ -23,11 +23,12 @@ ItemVariable::ItemVariable(CatVar &variable)
 void ItemVariable::Update()
 {
     Item::Update();
-    if (catvar.registered == true)
-        if (!catvar.desc_long.empty())
-            if (catvar.desc_long.length() && IsHovered() &&
-                catvar.desc_long != "no description")
-                ShowTooltip(catvar.desc_long);
+    if (catvar.name.c_str())
+        if (catvar.registered == true)
+            if (!catvar.desc_long.empty())
+                if (catvar.desc_long.length() && IsHovered() &&
+                    catvar.desc_long != "no description")
+                    ShowTooltip(catvar.desc_long);
 }
 
 void ItemVariable::Change(float amount)