diff --git a/TODO b/TODO
index 22ca46f16e..d427f43733 100644
--- a/TODO
+++ b/TODO
@@ -42,7 +42,7 @@ nuttx/
   (1)  Hitachi/Renesas SH-1 (arch/sh/src/sh1)
   (4)  Renesas M16C/26 (arch/sh/src/m16c)
  (11)  z80/z8/ez80/z180 (arch/z80/)
-  (9)  z16 (arch/z16/)
+  (8)  z16 (arch/z16/)
   (1)  mc68hc1x (arch/hc)
 
 apps/
@@ -2164,16 +2164,6 @@ o z16 (arch/z16)
   Priority:    Low, thought to be cosmetic.  I think this is a consequence of
                replacing vs. inserting the library.
 
-  Title:       SERIAL DRIVER HANGS
-  Description: When the interrupt-driven serial driver is used, the system
-               hangs.  This is because of TX ready (TRDE) interrupts that
-               get lost while interrupts are disabled.  The existing
-               serial driver appears to be limited to hardware with a
-               latching, level-sensitive TX ready interrupt.
-  Status:      Open
-  Priority:    Medium. A polled, write-only serial driver is used in the
-               interim for system testing.
-
   Title:       SYSTEM DELAYS
   Description: The system delays do not appear to be correct with the
                apps/examples/ostest/timedmqueue.c test.
diff --git a/arch/z16/src/z16f/z16f_serial.c b/arch/z16/src/z16f/z16f_serial.c
index 1845fece8f..d2f1960251 100644
--- a/arch/z16/src/z16f/z16f_serial.c
+++ b/arch/z16/src/z16f/z16f_serial.c
@@ -507,6 +507,7 @@ static int z16f_txinterrupt(int irq, void *context)
 
       uart_xmitchars(dev);
     }
+
   return OK;
 }
 
@@ -619,6 +620,12 @@ static void z16f_txint(struct uart_dev_s *dev, bool enable)
 #ifndef CONFIG_SUPPRESS_SERIAL_INTS
       up_enable_irq(priv->txirq);
 #endif
+
+      /* Fake a TX interrupt here by just calling uart_xmitchars() with
+       * interrupts disabled (note this may recurse).
+       */
+
+      uart_xmitchars(dev);
     }
   else
     {
diff --git a/configs/z16f2800100zcog/README.txt b/configs/z16f2800100zcog/README.txt
index 0edcbb6cf7..9279859805 100644
--- a/configs/z16f2800100zcog/README.txt
+++ b/configs/z16f2800100zcog/README.txt
@@ -53,31 +53,6 @@ Other Versions
   configs/z16f2800100zcog/*/Make.defs.  Simply edit these two files, changing
   5.0.1 to whatever.
 
-Issues
-======
-
-There are several, important open issues with the ZNEO port (9 as of this writing).
-See the TODO file in the top-level NuttX directory.  One of these should be
-mentioned here because it causes a failure to compile with older versions of
-Nuttx:
-
-  Description: The file drivers/mmcsd/mmcsd_sdio.c generates an internal compiler
-               error like:
-
-               mmcsd\mmcsd_sdio.c
-               Internal Error(0503) On line 2524 of "MMCSD\MMCSD_SDIO.C"
-                   File <c3>, Args(562,46)
-
-  Status:     Open.  Recommended workaround: remove mmcsd_sdio.c from
-              drivers/mmcsd/Make.defs.  There is no SDIO support for the Z16
-              anyway
-  Priority:   Low
-
-This is bug in ZDS-II.  It was discovered in version 4.11.0 and still exists
-in version 4.11.1.  I don't know about 5.0.1.  It is not a problem with recent
-versions of NuttX using any version because the file mmcsd_sdio.c is no longer
-built unconditionally.
-
 Selecting Configurations
 ========================
 
diff --git a/configs/z16f2800100zcog/nsh/nsh.zfpproj b/configs/z16f2800100zcog/nsh/nsh.zfpproj
index 457fa859a3..b889c95827 100644
--- a/configs/z16f2800100zcog/nsh/nsh.zfpproj
+++ b/configs/z16f2800100zcog/nsh/nsh.zfpproj
@@ -233,13 +233,6 @@
 
 <!-- breakpoint information -->
 <breakpoints>
-<breakpoint temporary="false" enabled="true" >
-<line-number>0</line-number>
-<pathname></pathname>
-<address>37442</address>
-<command></command>
-<preserve-type>1</preserve-type>
-</breakpoint>
 </breakpoints>
 
 </project>
\ No newline at end of file