diff --git a/client/src/lib.rs b/client/src/lib.rs
index 4e26a722f4..b0490018d9 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -1778,7 +1778,7 @@ impl Client {
                         if self.state.terrain().get_key(*key).is_none() {
                             if !skip_mode && !self.pending_chunks.contains_key(key) {
                                 const TOTAL_PENDING_CHUNKS_LIMIT: usize = 1024;
-                                const CURRENT_TICK_PENDING_CHUNKS_LIMIT: usize = 8;
+                                const CURRENT_TICK_PENDING_CHUNKS_LIMIT: usize = 8 * 4;
                                 if self.pending_chunks.len() < TOTAL_PENDING_CHUNKS_LIMIT
                                     && current_tick_send_chunk_requests
                                         < CURRENT_TICK_PENDING_CHUNKS_LIMIT
diff --git a/server/src/sys/chunk_serialize.rs b/server/src/sys/chunk_serialize.rs
index aa97fcb5b2..a35b9ea6e5 100644
--- a/server/src/sys/chunk_serialize.rs
+++ b/server/src/sys/chunk_serialize.rs
@@ -47,11 +47,11 @@ impl<'a> System<'a> for Sys {
             chunk_sender,
         ): Self::SystemData,
     ) {
-        // Only operate twice per second
+        /* // Only operate twice per second
         //TODO: move out of this system and now even spawn this.
         if tick.0.rem_euclid(15) != 0 {
             return;
-        }
+        } */
 
         struct Metadata {
             recipients: Vec<Entity>,
diff --git a/voxygen/src/mesh/terrain.rs b/voxygen/src/mesh/terrain.rs
index 113c22bfff..e8a1fa7336 100644
--- a/voxygen/src/mesh/terrain.rs
+++ b/voxygen/src/mesh/terrain.rs
@@ -210,7 +210,7 @@ fn calc_light<V: RectRasterableVol<Vox = Block> + ReadVol + Debug>(
     drop(light_map); */
 
     move |wpos| {
-        1.0
+        if is_sunlight { 1.0 } else { 0.0 }
         /* let pos = wpos - min_bounds.min;
         let l = light_map2
             .get(lm_idx2(pos.x, pos.y, pos.z))
diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs
index be634a59d8..a54b7db911 100644
--- a/voxygen/src/scene/terrain.rs
+++ b/voxygen/src/scene/terrain.rs
@@ -970,7 +970,7 @@ impl<V: RectRasterableVol> Terrain<V> {
                     })?))
             })
         {
-            if self.mesh_todos_active.load(Ordering::Relaxed) > meshing_cores {
+            if self.mesh_todos_active.load(Ordering::Relaxed) > meshing_cores * 8 {
                 break;
             }
 
@@ -1056,7 +1056,7 @@ impl<V: RectRasterableVol> Terrain<V> {
         // store it. Vary the rate at which we pull items out to correlate with the
         // framerate, preventing tail latency.
         span!(guard, "Get/upload meshed chunk");
-        const CHUNKS_PER_SECOND: f32 = 240.0;
+        const CHUNKS_PER_SECOND: f32 = 240.0 * 8.0;
         let recv_count =
             scene_data.state.get_delta_time() * CHUNKS_PER_SECOND + self.mesh_recv_overflow;
         self.mesh_recv_overflow = recv_count.fract();