diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs
index f0625e6ab2..7c59501a54 100644
--- a/src/BizHawk.Client.Common/RomLoader.cs
+++ b/src/BizHawk.Client.Common/RomLoader.cs
@@ -844,7 +844,7 @@ namespace BizHawk.Client.Common
 
 			public static readonly IReadOnlyCollection<string> A78 = new[] { "a78" };
 
-			public static readonly IReadOnlyCollection<string> Amiga = new[] { "adf", "adz", "dms", "fdi", "hdf", "ipf", "lha" };
+			public static readonly IReadOnlyCollection<string> Amiga = new[] { "adf", "adz", "dms", "fdi", /*"hdf", "ipf", "lha"*/ };
 
 			public static readonly IReadOnlyCollection<string> AppleII = new[] { "dsk", "do", "po" };
 
diff --git a/src/BizHawk.Emulation.Common/Database/Database.cs b/src/BizHawk.Emulation.Common/Database/Database.cs
index 0a85531db1..1eec9ca869 100644
--- a/src/BizHawk.Emulation.Common/Database/Database.cs
+++ b/src/BizHawk.Emulation.Common/Database/Database.cs
@@ -446,8 +446,8 @@ namespace BizHawk.Emulation.Common
 				case ".ADZ":
 				case ".DMS":				
 				case ".FDI":
-				case ".HDF":
-				case ".LHA":
+			//	case ".HDF":
+			//	case ".LHA":
 					game.System = VSystemID.Raw.Amiga;
 					break;
 
diff --git a/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.cs b/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.cs
index 1669d49610..b0589d4fdf 100644
--- a/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/Amiga/PUAE.cs
@@ -57,11 +57,11 @@ namespace BizHawk.Emulation.Cores.Computers.Amiga
 			var paue = PreInit<LibPUAE>(new WaterboxOptions
 			{
 				Filename                   = "puae.wbx",
-				SbrkHeapSizeKB             = 5 * 512,
-				SealedHeapSizeKB           = 10 * 1024,
-				InvisibleHeapSizeKB        = 10 * 1024,
-				PlainHeapSizeKB            = 10 * 1024,
-				MmapHeapSizeKB             = 40 * 1024,
+				SbrkHeapSizeKB             = 1024,
+				SealedHeapSizeKB           = 512,
+				InvisibleHeapSizeKB        = 512,
+				PlainHeapSizeKB            = 512,
+				MmapHeapSizeKB             = 20 * 1024,
 				SkipCoreConsistencyCheck   = lp.Comm.CorePreferences.HasFlag(CoreComm.CorePreferencesFlags.WaterboxCoreConsistencyCheck),
 				SkipMemoryConsistencyCheck = lp.Comm.CorePreferences.HasFlag(CoreComm.CorePreferencesFlags.WaterboxMemoryConsistencyCheck),
 			});