diff --git a/ALttPRandomizer/Randomizers/BaseRandomizer.cs b/ALttPRandomizer/Randomizers/BaseRandomizer.cs
index 494b231..f791f0d 100644
--- a/ALttPRandomizer/Randomizers/BaseRandomizer.cs
+++ b/ALttPRandomizer/Randomizers/BaseRandomizer.cs
@@ -59,9 +59,19 @@
                 "--shuffletavern",
             };
 
+            if (settings.DoorShuffle == DoorShuffle.Vanilla) {
+                settings.DoorTypeMode = DoorTypeMode.Original;
+            }
+
             foreach (var arg in SettingsProcessor.GetSettings(Instance, settings)) {
                 args.Add(arg);
             }
+
+            if (settings.DoorShuffle != DoorShuffle.Vanilla || settings.DropShuffle != DropShuffle.Vanilla
+                || (settings.Pottery != Pottery.Vanilla && settings.Pottery != Pottery.Cave)) {
+                args.Add("--dungeon_counters=on");
+            }
+
             return args;
         }
 
diff --git a/BaseRandomizer b/BaseRandomizer
index ca4829d..3c8b083 160000
--- a/BaseRandomizer
+++ b/BaseRandomizer
@@ -1 +1 @@
-Subproject commit ca4829db876599bc18ed4fa159b87506da6e3c0b
+Subproject commit 3c8b08329ba2b5fd8d561ca66a30d38aee77a82e