diff --git a/xous-rs/src/arch/test/mod.rs b/xous-rs/src/arch/test/mod.rs
index 6c5ff3df8..91ad1af1a 100644
--- a/xous-rs/src/arch/test/mod.rs
+++ b/xous-rs/src/arch/test/mod.rs
@@ -577,12 +577,12 @@ pub fn syscall(call: SysCall) -> SysCallResult {
             let call = crate::SysCall::from_args(nr, a1, a2, a3, a4, a5, a6, a7).unwrap();
 
             let mut xsc_borrowed = xsc.borrow_mut();
-            let xsc_asmut = xsc_borrowed.as_mut().expect(
+            let xsc_as_mut = xsc_borrowed.as_mut().expect(
                 "not connected to server (did you forget to create a thread with xous::create_thread()?)",
             );
             loop {
-                _xous_syscall_to(nr, a1, a2, a3, a4, a5, a6, a7, &call, xsc_asmut);
-                _xous_syscall_result(&mut ret, *tid.borrow(), xsc_asmut);
+                _xous_syscall_to(nr, a1, a2, a3, a4, a5, a6, a7, &call, xsc_as_mut);
+                _xous_syscall_result(&mut ret, *tid.borrow(), xsc_as_mut);
                 match ret {
                     Result::Error(e) => return Err(e),
                     Result::RetryCall => (),
diff --git a/xous-rs/src/definitions.rs b/xous-rs/src/definitions.rs
index 5a99c8309..65c53af0f 100644
--- a/xous-rs/src/definitions.rs
+++ b/xous-rs/src/definitions.rs
@@ -590,11 +590,11 @@ macro_rules! msg_blocking_scalar_unpack {
 }
 
 #[cfg(feature = "swap")]
-#[derive(Copy, Clone, PartialEq, Eq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum AllocAdvice {
     /// the PID of the allocation, virtual address in PID space, physical address
     Allocate(PID, usize, usize),
-    /// the PID of the page freed, virtuall address in PID space, physical address
+    /// the PID of the page freed, virtual address in PID space, physical address
     Free(PID, usize, usize),
     /// not yet initialized record
     Uninit,
diff --git a/xous-rs/src/definitions/limits.rs b/xous-rs/src/definitions/limits.rs
index ca737c780..17279f1b3 100644
--- a/xous-rs/src/definitions/limits.rs
+++ b/xous-rs/src/definitions/limits.rs
@@ -1,4 +1,5 @@
 #[repr(usize)]
+#[derive(Debug)]
 pub enum Limits {
     HeapMaximum = 1,
     HeapSize = 2,
diff --git a/xous-rs/src/definitions/memoryrange.rs b/xous-rs/src/definitions/memoryrange.rs
index 05894b3ca..5a85442ef 100644
--- a/xous-rs/src/definitions/memoryrange.rs
+++ b/xous-rs/src/definitions/memoryrange.rs
@@ -10,7 +10,7 @@ impl MemoryRange {
     /// # Safety
     ///
     /// This allows for creating a `MemoryRange` from any arbitrary pointer,
-    /// so it is imperitive that this only be used to point to valid, page-aligned
+    /// so it is imperative that this only be used to point to valid, page-aligned
     /// ranges.
     pub unsafe fn new(addr: usize, size: usize) -> core::result::Result<MemoryRange, Error> {
         Ok(MemoryRange {