diff --git a/assets/common/loot_tables/calendar/christmas/boss.ron b/assets/common/loot_tables/calendar/christmas/boss.ron
index 9e7da875a0..322d75c1f3 100644
--- a/assets/common/loot_tables/calendar/christmas/boss.ron
+++ b/assets/common/loot_tables/calendar/christmas/boss.ron
@@ -1,6 +1,6 @@
 [
     (4.0, ItemQuantity("common.items.food.blue_cheese", 1, 30)),
-    (3.0, Some(Item("common.items.armor.misc.head.woolly_wintercap"))),
-    (2.0, Some(Item("common.items.armor.misc.head.boreal_warhelm"))),
-    (1.0, Some(Item("common.items.lantern.polaris"))),
-]
\ No newline at end of file
+    (3.0, Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap")),
+    (2.0, Item("common.items.armor.misc.head.boreal_warhelm")),
+    (1.0, Item("common.items.lantern.polaris")),
+]
diff --git a/voxygen/benches/meshing_benchmark.rs b/voxygen/benches/meshing_benchmark.rs
index 9ebff52ec2..a5345b960e 100644
--- a/voxygen/benches/meshing_benchmark.rs
+++ b/voxygen/benches/meshing_benchmark.rs
@@ -23,6 +23,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
             // directly with a closure.
             seed_elements: true,
             world_file: sim::FileOpts::LoadAsset(sim::DEFAULT_WORLD_MAP.into()),
+            calendar: None,
         },
         &pool,
     );
diff --git a/world/examples/chunk_compression_benchmarks.rs b/world/examples/chunk_compression_benchmarks.rs
index 7d5698c41b..28e37d0c16 100644
--- a/world/examples/chunk_compression_benchmarks.rs
+++ b/world/examples/chunk_compression_benchmarks.rs
@@ -677,6 +677,7 @@ fn main() {
         WorldOpts {
             seed_elements: true,
             world_file: FileOpts::LoadAsset(DEFAULT_WORLD_MAP.into()),
+            calendar: None,
         },
         &pool,
     );
diff --git a/world/examples/dungeon_voxel_export.rs b/world/examples/dungeon_voxel_export.rs
index 307f9bdbb1..b9308454b1 100644
--- a/world/examples/dungeon_voxel_export.rs
+++ b/world/examples/dungeon_voxel_export.rs
@@ -29,6 +29,7 @@ fn main() -> Result {
         WorldOpts {
             seed_elements: true,
             world_file: FileOpts::LoadAsset(DEFAULT_WORLD_MAP.into()),
+            calendar: None,
         },
         &pool,
     );
diff --git a/world/examples/heightmap_visualization.rs b/world/examples/heightmap_visualization.rs
index 27b99708a2..12403b3313 100644
--- a/world/examples/heightmap_visualization.rs
+++ b/world/examples/heightmap_visualization.rs
@@ -124,6 +124,7 @@ fn main() {
         WorldOpts {
             seed_elements: true,
             world_file: FileOpts::LoadAsset(DEFAULT_WORLD_MAP.into()),
+            calendar: None,
         },
         &pool,
     );
diff --git a/world/examples/pricing_csv.rs b/world/examples/pricing_csv.rs
index 0565e4a99e..517d62cd1b 100644
--- a/world/examples/pricing_csv.rs
+++ b/world/examples/pricing_csv.rs
@@ -166,6 +166,7 @@ fn main() {
         WorldOpts {
             seed_elements: true,
             world_file: FileOpts::LoadAsset(DEFAULT_WORLD_MAP.into()),
+            calendar: None,
         },
         &pool,
     );
diff --git a/world/examples/view.rs b/world/examples/view.rs
index 56f0b105ac..07e7d0f747 100644
--- a/world/examples/view.rs
+++ b/world/examples/view.rs
@@ -35,7 +35,7 @@ fn main() {
                 let pos = focus + Vec2::new(i as i32, j as i32) * scale;
 
                 let (alt, place) = sampler
-                    .get((pos, index))
+                    .get((pos, index, None))
                     .map(|sample| {
                         (
                             sample.alt.sub(64.0).add(gain).mul(0.7).max(0.0).min(255.0) as u8,
diff --git a/world/examples/water.rs b/world/examples/water.rs
index b66ea79cc2..13d8e8b6f8 100644
--- a/world/examples/water.rs
+++ b/world/examples/water.rs
@@ -49,6 +49,7 @@ fn main() {
             world_file: sim::FileOpts::LoadAsset(veloren_world::sim::DEFAULT_WORLD_MAP.into()),
             /* world_file: sim::FileOpts::Load(_map_file),
              * world_file: sim::FileOpts::Save(sim::SizeOpts::default()), */
+            calendar: None,
         },
         &threadpool,
     );
@@ -66,6 +67,7 @@ fn main() {
                     uniform_idx_as_vec2(map_size_lg, posi)
                         * TerrainChunkSize::RECT_SIZE.map(|e| e as i32),
                     index,
+                    None,
                 ))
             })
             .collect::<Vec<_>>()
diff --git a/world/examples/world_block_statistics.rs b/world/examples/world_block_statistics.rs
index cccfd75782..c83f20ef73 100644
--- a/world/examples/world_block_statistics.rs
+++ b/world/examples/world_block_statistics.rs
@@ -67,6 +67,7 @@ fn generate(db_path: &str, ymin: Option<i32>, ymax: Option<i32>) -> Result<(), B
         WorldOpts {
             seed_elements: true,
             world_file: FileOpts::LoadAsset(DEFAULT_WORLD_MAP.into()),
+            calendar: None,
         },
         &pool,
     );
diff --git a/world/src/block/mod.rs b/world/src/block/mod.rs
index 473c17ae3b..5f2ae832ca 100644
--- a/world/src/block/mod.rs
+++ b/world/src/block/mod.rs
@@ -74,9 +74,9 @@ impl<'a> BlockGen<'a> {
             //tree_density,
             //forest_kind,
             //close_structures,
-            marble,
-            marble_mid,
-            marble_small,
+            marble: _,
+            marble_mid: _,
+            marble_small: _,
             rock,
             // temp,
             // humidity,