diff --git a/src/document.rs b/src/document.rs
index 056f37a..508d348 100644
--- a/src/document.rs
+++ b/src/document.rs
@@ -615,7 +615,7 @@ impl Page {
             let d = s.distance_to_point(pos);
             if d <= max_dist {
                 let key = (s.is_image(), d);
-                if best.map_or(true, |(_, best_key)| key < best_key) {
+                if best.is_none_or(|(_, best_key)| key < best_key) {
                     best = Some((s, key));
                 }
             }
diff --git a/src/export.rs b/src/export.rs
index af82258..8439e6e 100644
--- a/src/export.rs
+++ b/src/export.rs
@@ -564,7 +564,9 @@ fn render_pdf_raster(
         Ok(image) => {
             let rgb = image
                 .pixels
-                .chunks_exact(4)
+                .as_chunks::<4>()
+                .0
+                .iter()
                 .flat_map(|px| [px[0], px[1], px[2]])
                 .collect();
             rgb_xobject(image.width, image.height, rgb)
diff --git a/src/image_layer.rs b/src/image_layer.rs
index 5a86c9f..28c5882 100644
--- a/src/image_layer.rs
+++ b/src/image_layer.rs
@@ -238,7 +238,7 @@ impl ImageLayer {
         let too_small = self
             .vertex_buffer
             .as_ref()
-            .map_or(true, |b| b.size() < bytes.len() as u64);
+            .is_none_or(|b| b.size() < bytes.len() as u64);
         if too_small {
             self.vertex_buffer = Some(device.create_buffer(&wgpu::BufferDescriptor {
                 label: Some("Image Vertex Buffer"),