diff --git a/src-server/ll/api/service/TargetedBedrock.cpp b/src-server/ll/api/service/TargetedBedrock.cpp
index be70e5229b..eadf5d7d5a 100644
--- a/src-server/ll/api/service/TargetedBedrock.cpp
+++ b/src-server/ll/api/service/TargetedBedrock.cpp
@@ -22,8 +22,6 @@
 
 namespace ll::service::inline bedrock {
 
-using namespace ll::memory;
-
 // PropertiesSettings
 static std::atomic<PropertiesSettings*> propertiesSettings;
 
@@ -33,11 +31,11 @@ LL_TYPE_INSTANCE_HOOK(
     DedicatedServer,
     &DedicatedServer::runDedicatedServerLoop,
     DedicatedServer::StartResult,
-    Core::FilePathManager&                  filePathManager,
-    PropertiesSettings&                     properties,
-    LevelSettings&                          settings,
-    AllowListFile&                          allowListFile,
-    std::unique_ptr<class PermissionsFile>& permissionsFile
+    Core::FilePathManager&            filePathManager,
+    PropertiesSettings&               properties,
+    LevelSettings&                    settings,
+    AllowListFile&                    allowListFile,
+    std::unique_ptr<PermissionsFile>& permissionsFile
 ) {
     propertiesSettings               = &properties;
     DedicatedServer::StartResult res = origin(filePathManager, properties, settings, allowListFile, permissionsFile);
diff --git a/src/mc/deps/crypto/hash/HashType.h b/src/mc/deps/crypto/hash/HashType.h
index 0fc9d963ec..25d07d2f1c 100644
--- a/src/mc/deps/crypto/hash/HashType.h
+++ b/src/mc/deps/crypto/hash/HashType.h
@@ -4,7 +4,7 @@
 
 namespace Crypto::Hash {
 
-enum class HashType {
+enum class HashType : int {
     MD5    = 0x0,
     SHA1   = 0x1,
     SHA256 = 0x2,
diff --git a/src/mc/diagnostics/bedrock_log/LogChannel.h b/src/mc/diagnostics/bedrock_log/LogChannel.h
index f4d3cc0a7f..0f11c86694 100644
--- a/src/mc/diagnostics/bedrock_log/LogChannel.h
+++ b/src/mc/diagnostics/bedrock_log/LogChannel.h
@@ -4,7 +4,7 @@
 
 namespace BedrockLog {
 
-enum class LogChannel {
+enum class LogChannel : int {
     Global     = 0x0,
     ClientSide = 0x1,
     ServerSide = 0x2,
diff --git a/src/mc/network/ConnectionType.h b/src/mc/network/ConnectionType.h
index 70438d3918..018f42199d 100644
--- a/src/mc/network/ConnectionType.h
+++ b/src/mc/network/ConnectionType.h
@@ -4,17 +4,14 @@
 
 namespace Social {
 
-enum class ConnectionType {
-    Success            = 0,
-    CannotReadFromFile = 1,
-    CannotWriteToFile  = 2,
-    FileAlreadyExists  = 3,
-    CleanupFailed      = 4,
-    InvalidStatusCode  = 5,
-    InvalidUrl         = 6,
-    InternalError      = 7,
-    UserNotSignedIn    = 8,
-    NotInitialized     = 9,
-    UnknownError       = 10,
+enum class ConnectionType : short {
+    Undefined                 = -1,
+    Local                     = 0x0,
+    IPv4                      = 0x1,
+    IPv6                      = 0x2,
+    WebSocketsWebRTCSignaling = 0x3,
+    NAT                       = 0x5,
+    UPNP                      = 0x6,
+    UnknownIP                 = 0x7,
 };
 };
diff --git a/src/mc/server/commands/standard/NewExecuteCommand.h b/src/mc/server/commands/standard/NewExecuteCommand.h
index feb68589f5..f2b34326f7 100644
--- a/src/mc/server/commands/standard/NewExecuteCommand.h
+++ b/src/mc/server/commands/standard/NewExecuteCommand.h
@@ -19,8 +19,8 @@ class NewExecuteCommand : public ::Command {
     class ExecuteChainedSubcommand : public ::CommandChainedSubcommand {
     public:
         // ExecuteChainedSubcommand inner types define
-        enum class Subcommand {
-            None       = 0,
+        enum class Subcommand : int {
+            None       = 0x0,
             As         = 0x1,
             At         = 0x2,
             In         = 0x3,
diff --git a/src/mc/util/HudElement.h b/src/mc/util/HudElement.h
index ab1bad01f5..6024490d4c 100644
--- a/src/mc/util/HudElement.h
+++ b/src/mc/util/HudElement.h
@@ -2,7 +2,7 @@
 
 #include "mc/_HeaderOutputPredefine.h"
 
-enum class HudElement {
+enum class HudElement : int {
     PaperDoll     = 0x0,
     Armor         = 0x1,
     ToolTips      = 0x2,
diff --git a/src/mc/util/HudVisibility.h b/src/mc/util/HudVisibility.h
index 0560c5b90a..794de3d245 100644
--- a/src/mc/util/HudVisibility.h
+++ b/src/mc/util/HudVisibility.h
@@ -2,7 +2,8 @@
 
 #include "mc/_HeaderOutputPredefine.h"
 
-enum class HudVisibility {
+enum class HudVisibility : int {
     Hide  = 0x0,
     Reset = 0x1,
+    Count = 0x2,
 };
diff --git a/src/mc/world/actor/Actor.cpp b/src/mc/world/actor/Actor.cpp
index 045db23187..073e7e1e14 100644
--- a/src/mc/world/actor/Actor.cpp
+++ b/src/mc/world/actor/Actor.cpp
@@ -101,11 +101,11 @@ class HitResult Actor::traceRay(
     Vec3      rayDir{getViewVector()};
     HitResult result{};
     if (includeBlock) {
-        result = getDimensionBlockSource().clip(
+        result = getDimensionBlockSource().clip$(
             origin,
             origin + rayDir * tMax,
             true,
-            ShapeType::All,
+            ShapeType::Outline,
             ((static_cast<int>(tMax) + 1) * 2),
             false,
             false,
diff --git a/src/mc/world/inventory/transaction/ItemUseInventoryTransaction.h b/src/mc/world/inventory/transaction/ItemUseInventoryTransaction.h
index 4262f73e60..d99d571f16 100644
--- a/src/mc/world/inventory/transaction/ItemUseInventoryTransaction.h
+++ b/src/mc/world/inventory/transaction/ItemUseInventoryTransaction.h
@@ -11,10 +11,10 @@
 class ItemUseInventoryTransaction : public ::ComplexInventoryTransaction {
 public:
     // ItemUseInventoryTransaction inner types define
-    enum class ActionType {
-        Place   = 0,
-        Use     = 1,
-        Destroy = 2,
+    enum class ActionType : int {
+        Clear   = 0x0,
+        UriOnly = 0x1,
+        Named   = 0x2,
     };
 
     ActionType                 mActionType{};           // this+0x0
diff --git a/src/mc/world/level/ShapeType.h b/src/mc/world/level/ShapeType.h
index 3af5eb6939..980da6c411 100644
--- a/src/mc/world/level/ShapeType.h
+++ b/src/mc/world/level/ShapeType.h
@@ -2,7 +2,8 @@
 
 #include "mc/_HeaderOutputPredefine.h"
 
-enum class ShapeType {
-    All       = 0, // need to check
-    SolidOnly = 1, // need to check
+enum class ShapeType : uchar {
+    Outline            = 0x0,
+    Collision          = 0x1,
+    CollisionForCamera = 0x2,
 };
diff --git a/src/mc/world/level/storage/AllExperiments.h b/src/mc/world/level/storage/AllExperiments.h
index 5e27d3286d..81f7c7a816 100644
--- a/src/mc/world/level/storage/AllExperiments.h
+++ b/src/mc/world/level/storage/AllExperiments.h
@@ -2,4 +2,26 @@
 
 #include "mc/_HeaderOutputPredefine.h"
 
-enum class AllExperiments {};
+enum class AllExperiments : int {
+    TestExperiment                         = 0x0,
+    NextUpdate                             = 0x1,
+    DisabledExperiment                     = 0x2,
+    ExperimentalText                       = 0x3,
+    AllowSeedChange                        = 0x4,
+    Bundles                                = 0x5,
+    DataDrivenBiomes                       = 0x6,
+    UpcomingCreatorFeatures                = 0x7,
+    Gametest                               = 0x8,
+    DataDrivenVanillaBlocksAndItems        = 0x9,
+    DisableDataDrivenVanillaBlocksAndItems = 0xa,
+    ThirdPersonCameras                     = 0xb,
+    FocusTargetCamera                      = 0xc,
+    MinecraftExplorer                      = 0xd,
+    DeferredTechnicalPreview               = 0xe,
+    VillagerTradesRebalance                = 0xf,
+    VanillaBlockGeometry                   = 0x10,
+    JigsawStructures                       = 0x11,
+    CameraAimAssist                        = 0x12,
+    ExperimentalGraphics                   = 0x13,
+    NumExperiments                         = 0x14,
+}