diff --git a/arch/z16/src/common/up_registerdump.c b/arch/z16/src/common/up_registerdump.c
index 5164dd0a616..b854f48822d 100644
--- a/arch/z16/src/common/up_registerdump.c
+++ b/arch/z16/src/common/up_registerdump.c
@@ -76,7 +76,7 @@
 #ifdef CONFIG_ARCH_STACKDUMP
 static void up_registerdump(void)
 {
-  uint32 *regs32 = (uint32*)current_regs;
+  FAR uint32 *regs32 = (FAR uint32*)current_regs;
   lldbg("R0 :%08x R1 :%08x R2 :%08x R3 :%08x "
         "R4 :%08x R5 :%08x R6 :%08x R7 :%08x\n"
         regs32[REG_R0/2],  regs32[REG_R1/2], regs32[REG_R2/2], regs32[REG_R3/2],
diff --git a/arch/z16/src/common/up_schedulesigaction.c b/arch/z16/src/common/up_schedulesigaction.c
index 3284fd1bf2b..f085b2e950c 100644
--- a/arch/z16/src/common/up_schedulesigaction.c
+++ b/arch/z16/src/common/up_schedulesigaction.c
@@ -104,7 +104,7 @@ void up_schedule_sigaction(FAR _TCB *tcb, sig_deliver_t sigdeliver)
 {
   /* Refuse to handle nested signal actions */
 
-  dbg("tcb=0x%p sigdeliver=0x%04x\n", tcb, (chipreg_t)sigdeliver);
+  dbg("tcb=0x%p sigdeliver=0x%06x\n", tcb, (uint32)sigdeliver);
 
   if (!tcb->xcp.sigdeliver)
     {
@@ -141,7 +141,7 @@ void up_schedule_sigaction(FAR _TCB *tcb, sig_deliver_t sigdeliver)
 
           else
             {
-              uint32 *current_pc      = (uint32*)&current_regs[REG_PC];
+              FAR uint32 *current_pc  = (FAR uint32*)&current_regs[REG_PC];
 
               /* Save the return address and interrupt state.
                * These will be restored by the signal trampoline after
diff --git a/arch/z16/src/common/up_sigdeliver.c b/arch/z16/src/common/up_sigdeliver.c
index ce94d1a4094..09bcd14ac82 100644
--- a/arch/z16/src/common/up_sigdeliver.c
+++ b/arch/z16/src/common/up_sigdeliver.c
@@ -82,9 +82,9 @@
 void up_sigdeliver(void)
 {
 #ifndef CONFIG_DISABLE_SIGNALS
-  _TCB  *rtcb = (_TCB*)g_readytorun.head;
+  FAR _TCB  *rtcb = (_TCB*)g_readytorun.head;
   chipreg_t regs[XCPTCONTEXT_REGS];
-  uint32   *regs32 = (uint32*)regs;
+  FAR uint32 *regs32 = (FAR uint32*)regs;
   sig_deliver_t sigdeliver;
 
   /* Save the errno.  This must be preserved throughout the signal handling