diff --git a/.hemtt/project.toml b/.hemtt/project.toml
index efd78cc..0ad659d 100644
--- a/.hemtt/project.toml
+++ b/.hemtt/project.toml
@@ -8,9 +8,6 @@ include = ["./include"]
 [version]
 path = "addons/Streamator/macros.hpp"
 
-[asc]
-enabled = true
-
 [hemtt.signing]
 authority = "Streamator"
 
diff --git a/addons/Streamator/Spectator/Input/fn_keyDownEH.sqf b/addons/Streamator/Spectator/Input/fn_keyDownEH.sqf
index 4100b3f..da8ef79 100644
--- a/addons/Streamator/Spectator/Input/fn_keyDownEH.sqf
+++ b/addons/Streamator/Spectator/Input/fn_keyDownEH.sqf
@@ -248,11 +248,7 @@ private _return = switch (_keyCode) do {
                 CAMERAMODE_FREE;
             };
             case DIK_RETURN: {
-                if (GVAR(CameraMode) == CAMERAMODE_FREE) then {
-                    CAMERAMODE_FOLLOW
-                } else {
-                    GVAR(CameraMode);
-                };
+                [GVAR(CameraMode), CAMERAMODE_FOLLOW] select (GVAR(CameraMode) == CAMERAMODE_FREE);
             };
             case DIK_NUMPAD1: {CAMERAMODE_FOLLOW};
             case DIK_NUMPAD2: {CAMERAMODE_SHOULDER};
diff --git a/addons/Streamator/Spectator/Menu/SubMenus/fn_miscSubMenus.sqf b/addons/Streamator/Spectator/Menu/SubMenus/fn_miscSubMenus.sqf
index 7753a5d..b73932c 100644
--- a/addons/Streamator/Spectator/Menu/SubMenus/fn_miscSubMenus.sqf
+++ b/addons/Streamator/Spectator/Menu/SubMenus/fn_miscSubMenus.sqf
@@ -60,7 +60,7 @@
 }] call FUNC(addMenuItem);
 
 ["View Distance", "MAIN/MISC", DIK_F4, "MAIN/MISC/VIEWDISTANCE", {!GVAR(MapOpen)}, true] call FUNC(addMenuItem);
-CREATE_BACK_ACTION("MAIN/MISC/VIEWDISTANCE", "MAIN/MISC");
+CREATE_BACK_ACTION("MAIN/MISC/VIEWDISTANCE","MAIN/MISC");
 
 private _fnc_doViewDistance = {
     params ["_type"];
diff --git a/addons/Streamator/Spectator/Menu/SubMenus/fn_visionSubMenus.sqf b/addons/Streamator/Spectator/Menu/SubMenus/fn_visionSubMenus.sqf
index 6cf62c8..bfbd593 100644
--- a/addons/Streamator/Spectator/Menu/SubMenus/fn_visionSubMenus.sqf
+++ b/addons/Streamator/Spectator/Menu/SubMenus/fn_visionSubMenus.sqf
@@ -51,7 +51,7 @@
 }] call FUNC(addMenuItem);
 // Thermal Vision Modes
 ["Thermal Modes", "MAIN/VISION", DIK_F4, "MAIN/VISION/THERMALMODES", {true}, true] call FUNC(addMenuItem);
-CREATE_BACK_ACTION("MAIN/VISION/THERMALMODES", "MAIN/VISION");
+CREATE_BACK_ACTION("MAIN/VISION/THERMALMODES","MAIN/VISION");
 
 private _fnc_setThermalMode = {
     params ["_mode"];
diff --git a/addons/Streamator/Spectator/UI/fn_findInputEvents.sqf b/addons/Streamator/Spectator/UI/fn_findInputEvents.sqf
index 0ad78a6..1796796 100644
--- a/addons/Streamator/Spectator/UI/fn_findInputEvents.sqf
+++ b/addons/Streamator/Spectator/UI/fn_findInputEvents.sqf
@@ -71,17 +71,17 @@ params ["_ctrlInfo"];
                             _data = _data select 0;
                         };
                         private _distance = switch (typeName _data) do {
-                            case (typeName ""): {
+                            case ("STRING"): {
                                 GVAR(Camera) distance2D (getMarkerPos _data);
                             };
-                            case (typeName []);
-                            case (typeName objNull): {
+                            case ("ARRAY");
+                            case ("OBJECT"): {
                                 GVAR(Camera) distance _data;
                             };
-                            case (typeName grpNull): {
+                            case ("GROUP"): {
                                 GVAR(Camera) distance (leader _data);
                             };
-                            case (typeName locationNull): {
+                            case ("LOCATION"): {
                                 GVAR(Camera) distance (getPos _data);
                             };
                             default {
diff --git a/addons/Streamator/Spectator/User/fn_addCustom3dIcon.sqf b/addons/Streamator/Spectator/User/fn_addCustom3dIcon.sqf
index b5ba63b..b340587 100644
--- a/addons/Streamator/Spectator/User/fn_addCustom3dIcon.sqf
+++ b/addons/Streamator/Spectator/User/fn_addCustom3dIcon.sqf
@@ -20,7 +20,7 @@ private _buildedIcons = [];
 {
     private _code = _x param [13, {}, [{}]];
     private _codeStr = {
-        if (GVAR(hideUI)) then {false} else {GVAR(OverlayCustomMarker)};
+        !GVAR(hideUI) && GVAR(OverlayCustomMarker)
     } call CFUNC(codeToString);
     if (_code isNotEqualTo {}) then {
         private _strCond = _code call CFUNC(codeToString);