diff --git a/arch/z80/src/common/up_doirq.c b/arch/z80/src/common/up_doirq.c
index 951dedc04e..fae0142eba 100644
--- a/arch/z80/src/common/up_doirq.c
+++ b/arch/z80/src/common/up_doirq.c
@@ -96,7 +96,7 @@ FAR chipreg_t *up_doirq(ubyte irq, FAR chipreg_t *regs)
 
        regs = IRQ_STATE();
 
-       /* Indicate that we are no long in interrupt processing logic */
+       /* Indicate that we are no longer in interrupt processing logic */
 
        IRQ_LEAVE(irq);
     }
diff --git a/arch/z80/src/z8/z8_restorecontext.S b/arch/z80/src/z8/z8_restorecontext.S
index ef22b10e46..4cdd0d3d0c 100755
--- a/arch/z80/src/z8/z8_restorecontext.S
+++ b/arch/z80/src/z8/z8_restorecontext.S
@@ -97,8 +97,7 @@ _z8_restorecontext:
 	ldx	r7, 3(rr0)
 
 	/* Copy all registers into the user register area.  NOTE: we
-	 * should use the saved RP value to determine the destination
-	 * address
+	 * use the saved RP value to determine the destination adress.
 	 */
 
 	clr	r0			/* rr0 = destination address */
@@ -130,8 +129,8 @@ _z8_restore:
 
 	/* Recover the flags and RP settings.. but don't restore them yet */
 
-	ldx	r1, XCPT_FLAGS_OFFS(rr0)
-	ldx	r2, XCPT_RP_OFFS(rr0)
+	ldx	r1, XCPT_FLAGS_OFFS(rr6)
+	ldx	r2, XCPT_RP_OFFS(rr6)
 
 	/* Determine whether interrupts must be enabled on return.  This
 	 * would be nicer to do below, but later we will need to preserve