diff --git a/docs/GameData/Calligraphy.md b/docs/GameData/Calligraphy.md
index cfd91c57..647cf413 100644
--- a/docs/GameData/Calligraphy.md
+++ b/docs/GameData/Calligraphy.md
@@ -51,7 +51,7 @@ struct GenericRecord
 }
 
 [Flags]
-enum GenericRecordFlags
+enum GenericRecordFlags : byte
 {
     None        = 0,
     Protected   = 1 << 0
@@ -73,7 +73,7 @@ struct PrototypeRecord
 }
 
 [Flags]
-enum PrototypeRecordFlags
+enum PrototypeRecordFlags : byte
 {
     None        = 0,
     Abstract    = 1 << 0,
@@ -134,7 +134,7 @@ struct AssetValue
 }
 
 [Flags]
-enum AssetValueFlags
+enum AssetValueFlags : byte
 {
     None        = 0,
     Protected   = 1 << 0
diff --git a/src/MHServerEmu/Games/GameData/Calligraphy/CalligraphyEnums.cs b/src/MHServerEmu/Games/GameData/Calligraphy/CalligraphyEnums.cs
index 5c238e01..9a5483a1 100644
--- a/src/MHServerEmu/Games/GameData/Calligraphy/CalligraphyEnums.cs
+++ b/src/MHServerEmu/Games/GameData/Calligraphy/CalligraphyEnums.cs
@@ -24,35 +24,35 @@
     // Bit field enums
 
     [Flags]
-    public enum CurveRecordFlags
+    public enum CurveRecordFlags : byte
     {
         None        = 0
         // Although curve records do have a field for flags, it's 0 for all records
     }
 
     [Flags]
-    public enum AssetTypeRecordFlags
+    public enum AssetTypeRecordFlags : byte
     {
         None        = 0,
         Protected   = 1 << 0    // AssetDirectory::AssetTypeIsProtected
     }
 
     [Flags]
-    public enum AssetValueFlags
+    public enum AssetValueFlags : byte
     {
         None        = 0,
         Protected   = 1 << 0    // AssetType::AssetIsProtected
     }
 
     [Flags]
-    public enum BlueprintRecordFlags
+    public enum BlueprintRecordFlags : byte
     {
         None        = 0,
         Protected   = 1 << 0    // DataDirectory::BlueprintIsProtected
     }
 
     [Flags]
-    public enum PrototypeRecordFlags
+    public enum PrototypeRecordFlags : byte
     {
         None        = 0,
         Abstract    = 1 << 0,   // DataDirectory::PrototypeIsAbstract
diff --git a/src/MHServerEmu/Games/GameData/DataDirectory.cs b/src/MHServerEmu/Games/GameData/DataDirectory.cs
index 2b5ab1d1..af70e7d3 100644
--- a/src/MHServerEmu/Games/GameData/DataDirectory.cs
+++ b/src/MHServerEmu/Games/GameData/DataDirectory.cs
@@ -6,7 +6,7 @@ using MHServerEmu.Games.GameData.Prototypes;
 
 namespace MHServerEmu.Games.GameData
 {
-    public enum DataOrigin
+    public enum DataOrigin : byte
     {
         Unknown,        // Default value returned by DataDirectory::GetDataOrigin()
         Calligraphy,