diff --git a/maps/journey/constants.lua b/maps/journey/constants.lua
index 769aa794..5592781a 100644
--- a/maps/journey/constants.lua
+++ b/maps/journey/constants.lua
@@ -203,6 +203,8 @@ Public.build_type_whitelist = {
     ['arithmetic-combinator'] = true,
     ['constant-combinator'] = true,
     ['decider-combinator'] = true,
+    ['selector-combinator'] = true,
+    ['display-panel'] = true,
     ['electric-energy-interface'] = true,
     ['electric-pole'] = true,
     ['gate'] = true,
diff --git a/maps/journey/unique_modifiers.lua b/maps/journey/unique_modifiers.lua
index 8dad649b..5bb6b82f 100644
--- a/maps/journey/unique_modifiers.lua
+++ b/maps/journey/unique_modifiers.lua
@@ -346,25 +346,18 @@ Public.wasteland = {
         local surface = game.surfaces.nauvis
         local mgs = surface.map_gen_settings
         mgs.terrain_segmentation = 2.7
-        mgs.water = mgs.water + 1
         surface.map_gen_settings = mgs
         surface.clear(true)
     end,
-    clear = function (journey)
-        local surface = game.surfaces.nauvis
-        local mgs = surface.map_gen_settings
-        mgs.water = mgs.water - 1
-        surface.map_gen_settings = mgs
+    set_specials = function (journey)
+        journey.world_specials['water'] = 2
     end
 }
 
 Public.oceanic = {
     on_world_start = function (journey)
         local surface = game.surfaces.nauvis
-        local mgs = surface.map_gen_settings
-        mgs.terrain_segmentation = 0.5
-        mgs.water = mgs.water + 6
-        surface.map_gen_settings = mgs
+
         surface.clear(true)
     end,
     on_robot_built_entity = function (event)
@@ -391,11 +384,8 @@ Public.oceanic = {
             entity.die()
         end
     end,
-    clear = function (journey)
-        local surface = game.surfaces.nauvis
-        local mgs = surface.map_gen_settings
-        mgs.water = mgs.water - 6
-        surface.map_gen_settings = mgs
+    set_specials = function (journey)
+        journey.world_specials['water'] = 6
     end
 }