diff --git a/Logic/Actors/AvailableBaseLayersImplementation.ts b/Logic/Actors/AvailableBaseLayersImplementation.ts
index 0e9a29ad0..80cdb9c18 100644
--- a/Logic/Actors/AvailableBaseLayersImplementation.ts
+++ b/Logic/Actors/AvailableBaseLayersImplementation.ts
@@ -103,7 +103,7 @@ export default class AvailableBaseLayersImplementation implements AvailableBaseL
                     id: id,
                     name: name,
                     layer: () => L.tileLayer.provider(id, {
-                        maxNativeZoom: layer.opttions.maxZoom
+                        maxNativeZoom: layer.options?.maxZoom
                     }),
                     min_zoom: 1,
                     max_zoom: layer.options.maxZoom,
diff --git a/Logic/DetermineLayout.ts b/Logic/DetermineLayout.ts
index 3c4c82742..4dcb1c1d7 100644
--- a/Logic/DetermineLayout.ts
+++ b/Logic/DetermineLayout.ts
@@ -143,8 +143,8 @@ export default class DetermineLayout {
             tagRenderings: SharedTagRenderings.SharedTagRenderingJson,
             sharedLayers: knownLayersDict
         }
-        json = new FixLegacyTheme().convertStrict(converState, json, "While loading a dynamic theme")
-        json = new PrepareTheme().convertStrict(converState, json, "While preparing a dynamic theme")
+        json = new FixLegacyTheme().convertStrict(json, "While loading a dynamic theme")
+        json = new PrepareTheme(converState).convertStrict(json, "While preparing a dynamic theme")
         console.log("The layoutconfig is ", json)
         return json
     }