diff --git a/src/cpu_stats.rs b/src/cpu_stats.rs
index c31ecad352..eb1ff54d7e 100644
--- a/src/cpu_stats.rs
+++ b/src/cpu_stats.rs
@@ -1,4 +1,4 @@
-use core::sync::atomic::{AtomicU64, AtomicU8, AtomicUsize, Ordering};
+use core::sync::atomic::{AtomicU8, AtomicUsize, Ordering};
 
 use alloc::string::String;
 #[cfg(feature = "sys_stat")]
@@ -6,12 +6,13 @@ use alloc::vec::Vec;
 
 use crate::cpu_set::LogicalCpuId;
 
+// Note: Using AtomicUsize rather than AtomicU64 as 32bit x86 doesn't support the latter
 /// The number of times (overall) where a CPU switched from one context to another.
-static CONTEXT_SWITCH_COUNT: AtomicU64 = AtomicU64::new(0);
+static CONTEXT_SWITCH_COUNT: AtomicUsize = AtomicUsize::new(0);
 /// Number of times each Interrupt happened.
-static IRQ_COUNT: [AtomicU64; 256] = [const { AtomicU64::new(0) }; 256];
+static IRQ_COUNT: [AtomicUsize; 256] = [const { AtomicUsize::new(0) }; 256];
 /// Number of contexts that were created.
-static CONTEXTS_COUNT: AtomicU64 = AtomicU64::new(0);
+static CONTEXTS_COUNT: AtomicUsize = AtomicUsize::new(0);
 
 /// Current state of a CPU
 #[repr(u8)]
diff --git a/src/startup/memory.rs b/src/startup/memory.rs
index 59ed8dc725..1cc7eff529 100644
--- a/src/startup/memory.rs
+++ b/src/startup/memory.rs
@@ -276,11 +276,13 @@ unsafe fn map_memory<A: Arch>(areas: &[MemoryArea], mut bump_allocator: &mut Bum
     let mut mapper = PageMapper::<A, _>::create(TableKind::Kernel, &mut bump_allocator)
         .expect("failed to create Mapper");
 
-    #[cfg(target_arch = "i686")]
+    #[cfg(target_arch = "x86")]
     {
         // Pre-allocate all kernel PD entries so that when the page table is copied,
         // these entries are synced between processes
         for i in 512..1024 {
+            use rmm::{FrameAllocator, PageEntry};
+
             let phys = mapper
                 .allocator_mut()
                 .allocate_one()