diff --git a/arch/arm/src/armv7-a/arm_copyarmstate.c b/arch/arm/src/armv7-a/arm_copyarmstate.c
index 0a9d8ca1b19..20f1934efff 100644
--- a/arch/arm/src/armv7-a/arm_copyarmstate.c
+++ b/arch/arm/src/armv7-a/arm_copyarmstate.c
@@ -89,7 +89,7 @@ void up_copyarmstate(uint32_t *dest, uint32_t *src)
 
       up_savefpu(dest);
 
-      /* Then copy all of the ARM registers (mitting the floating point
+      /* Then copy all of the ARM registers (omitting the floating point
        * registers).  Indices: 0 through (ARM_CONTEXT_REGS-1).
        */
 
diff --git a/arch/z80/src/z180/z180_mmu.c b/arch/z80/src/z180/z180_mmu.c
index e63e1840323..0f888e96187 100644
--- a/arch/z80/src/z180/z180_mmu.c
+++ b/arch/z80/src/z180/z180_mmu.c
@@ -247,7 +247,12 @@ int up_addrenv_create(size_t textsize, size_t datasize, size_t heapsize,
 
   /* Convert the size from bytes to numbers of pages */
 
+#ifdef CONFIG_BUILD_KERNEL
   envsize = textsize + datasize + heapsize;
+#else
+  envsize = textsize + datasize;
+#endif
+
   npages  = PHYS_ALIGNUP(envsize);
   if (npages < 1)
     {
@@ -414,12 +419,14 @@ int up_addrenv_vdata(FAR group_addrenv_t *addrenv, uintptr_t textsize,
  *
  ****************************************************************************/
 
+#ifdef CONFIG_BUILD_KERNEL
 ssize_t up_addrenv_heapsize(FAR const group_addrenv_t *addrenv)
 {
   /* Not implemented */
 
   return (ssize_t)-ENOSYS;
 }
+#endif
 
 /****************************************************************************
  * Name: up_addrenv_select