diff --git a/AssetStudio/BundleFile.cs b/AssetStudio/BundleFile.cs
index e421af6..be2aa57 100644
--- a/AssetStudio/BundleFile.cs
+++ b/AssetStudio/BundleFile.cs
@@ -374,7 +374,7 @@ namespace AssetStudio
             }
             using (var blocksInfoReader = new EndianBinaryReader(blocksInfoUncompresseddStream))
             {
-                if (m_Header.version >= 7 || (Game.Type.IsSRGroup() && HasUncompressedDataHash))
+                if (HasUncompressedDataHash)
                 {
                     var uncompressedDataHash = blocksInfoReader.ReadBytes(16);
                 }
diff --git a/AssetStudio/GameManager.cs b/AssetStudio/GameManager.cs
index f056f27..82a396c 100644
--- a/AssetStudio/GameManager.cs
+++ b/AssetStudio/GameManager.cs
@@ -19,7 +19,7 @@ namespace AssetStudio
             Games.Add(index++, new Blk(GameType.GI_CB3, GI_CBXExpansionKey, initVector: GI_CBXInitVector, initSeed: GI_CBXInitSeed));
             Games.Add(index++, new Mhy0(GameType.GI_CB3Pre, GI_CBXMhy0ShiftRow, GI_CBXMhy0Key, GI_CBXMhy0Mul, GI_CBXExpansionKey, GI_CBXSBox, GI_CBXInitVector, GI_CBXInitSeed));
             Games.Add(index++, new Mr0k(GameType.BH3, BH3ExpansionKey, BH3SBox, BH3InitVector, BH3BlockKey));
-            Games.Add(index++, new Mr0k(GameType.BH3_Pre, PackExpansionKey, blockKey: PackBlockKey));
+            Games.Add(index++, new Mr0k(GameType.BH3Pre, PackExpansionKey, blockKey: PackBlockKey));
             Games.Add(index++, new Mr0k(GameType.SR_CB2, Mr0kExpansionKey, initVector: Mr0kInitVector, blockKey: Mr0kBlockKey));
             Games.Add(index++, new Mr0k(GameType.SR, Mr0kExpansionKey, initVector: Mr0kInitVector, blockKey: Mr0kBlockKey));
             Games.Add(index++, new Mr0k(GameType.ZZZ_CB1, Mr0kExpansionKey, initVector: Mr0kInitVector, blockKey: Mr0kBlockKey));
@@ -123,7 +123,7 @@ namespace AssetStudio
         GI_CB3,
         GI_CB3Pre,
         BH3,
-        BH3_Pre,
+        BH3Pre,
         ZZZ_CB1,
         SR_CB2,
         SR,
@@ -149,7 +149,7 @@ namespace AssetStudio
         public static bool IsGICB3(this GameType type) => type == GameType.GI_CB3;
         public static bool IsGICB3Pre(this GameType type) => type == GameType.GI_CB3Pre;
         public static bool IsBH3(this GameType type) => type == GameType.BH3;
-        public static bool IsBH3Pre(this GameType type) => type == GameType.BH3_Pre;
+        public static bool IsBH3Pre(this GameType type) => type == GameType.BH3Pre;
         public static bool IsZZZCB1(this GameType type) => type == GameType.ZZZ_CB1;
         public static bool IsSRCB2(this GameType type) => type == GameType.SR_CB2;
         public static bool IsSR(this GameType type) => type == GameType.SR;
@@ -171,7 +171,7 @@ namespace AssetStudio
 
         public static bool IsBH3Group(this GameType type) => type switch
         {
-            GameType.BH3 or GameType.BH3_Pre => true,
+            GameType.BH3 or GameType.BH3Pre => true,
             _ => false,
         };
 
@@ -183,13 +183,13 @@ namespace AssetStudio
 
         public static bool IsBlockFile(this GameType type) => type switch
         {
-            GameType.BH3 or GameType.BH3_Pre or GameType.SR or GameType.GI_Pack or GameType.TOT => true,
+            GameType.BH3 or GameType.BH3Pre or GameType.SR or GameType.GI_Pack or GameType.TOT => true,
             _ => false,
         };
 
         public static bool IsMhyGroup(this GameType type) => type switch
         {
-            GameType.GI or GameType.GI_Pack or GameType.GI_CB1 or GameType.GI_CB2 or GameType.GI_CB3 or GameType.GI_CB3Pre or GameType.BH3 or GameType.SR_CB2 or GameType.SR or GameType.TOT => true,
+            GameType.GI or GameType.GI_Pack or GameType.GI_CB1 or GameType.GI_CB2 or GameType.GI_CB3 or GameType.GI_CB3Pre or GameType.BH3 or GameType.BH3Pre or GameType.SR_CB2 or GameType.SR or GameType.TOT => true,
             _ => false,
         };
     }
diff --git a/AssetStudioGUI/AssetBrowser.cs b/AssetStudioGUI/AssetBrowser.cs
index e495c30..e2da8ed 100644
--- a/AssetStudioGUI/AssetBrowser.cs
+++ b/AssetStudioGUI/AssetBrowser.cs
@@ -101,7 +101,7 @@ namespace AssetStudioGUI
         public void Clear()
         {
             ResourceMap.Clear();
-            assetListView.DataSource = null;
+            assetListView.DataSource = Array.Empty<AssetEntry>();
         }
     }
 }