diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs
index 67d8428d9a..3bf6e36577 100644
--- a/wgpu-core/src/device/mod.rs
+++ b/wgpu-core/src/device/mod.rs
@@ -81,6 +81,8 @@ pub fn all_image_stages() -> hal::pso::PipelineStage {
 }
 
 #[derive(Clone, Copy, Debug, PartialEq)]
+#[cfg_attr(feature = "trace", derive(serde::Serialize))]
+#[cfg_attr(feature = "replay", derive(serde::Deserialize))]
 pub enum HostMap {
     Read,
     Write,
diff --git a/wgpu-types/src/lib.rs b/wgpu-types/src/lib.rs
index 148256729c..52b9235b99 100644
--- a/wgpu-types/src/lib.rs
+++ b/wgpu-types/src/lib.rs
@@ -1475,7 +1475,7 @@ impl<L: Default> Default for SamplerDescriptor<L> {
             min_filter: Default::default(),
             mipmap_filter: Default::default(),
             lod_min_clamp: 0.0,
-            lod_max_clamp: f32::MAX,
+            lod_max_clamp: std::f32::MAX,
             compare: Default::default(),
             anisotropy_clamp: Default::default(),
             _non_exhaustive: Default::default(),