diff --git a/TODO b/TODO
index 64cb151fa1..8faa88de68 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-NuttX TODO List (Last updated June 10, 2011)
+NuttX TODO List (Last updated June 13, 2011)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 nuttx/
@@ -17,7 +17,7 @@ nuttx/
   (1)  Graphics subystem (graphics/)
   (1)  Pascal add-on (pcode/)
   (1)  Documentation (Documentation/)
-  (5)  Build system / Toolchains
+  (4)  Build system / Toolchains
   (7)  Linux/Cywgin simulation (arch/sim)
   (4)  ARM (arch/arm/)
   (1)  ARM/C5471 (arch/arm/src/c5471/)
@@ -506,10 +506,6 @@ o Documentation (Documentation/)
 o Build system
   ^^^^^^^^^^^^
 
-  Description: configs/pjrc-8051 should be configs/pjrc-87c52
-  Status:      Open
-  Priority:    Low
-
   Description: Dependencies do not work correctly under configs/<board>/src
                (same as arch/<arch>/src/board).
   Status:      Open
@@ -526,7 +522,7 @@ o Build system
   Status:      Open
   Priority:    Low
 
-  Descritpion: Logic in most setenv.sh files can create the following problem
+  Description: Logic in most setenv.sh files can create the following problem
                on many platforms:
 
                  $ . ./setenv.sh
@@ -1225,7 +1221,7 @@ o NuttShell (NSH) (apps/nshlib)
   Status:      Open
   Priority:    Med-High
 
-  Descripton:  The ifconfig command will not behave correctly is an interface
+  Descripton:  The ifconfig command will not behave correctly if an interface
                is provided and there are multiple interfaces.  It should only
                show status for the single interface on the command line; it will
                still show status for all interfaces.
diff --git a/arch/avr/src/at90usb/at90usb_lowconsole.c b/arch/avr/src/at90usb/at90usb_lowconsole.c
index 5360eb44d5..bbba4478b9 100644
--- a/arch/avr/src/at90usb/at90usb_lowconsole.c
+++ b/arch/avr/src/at90usb/at90usb_lowconsole.c
@@ -199,7 +199,7 @@ void usart1_configure(void)
 
 #if CONFIG_USART1_PARITY == 1
   ucsr1c |= ((1 << UPM11) | (1 << UPM10)); /* Odd parity */
-#else
+#elif CONFIG_USART1_PARITY == 2
   ucsr1c |= (1 << UPM11);                  /* Even parity */
 #endif
 
diff --git a/arch/avr/src/atmega/atmega_lowconsole.c b/arch/avr/src/atmega/atmega_lowconsole.c
index bd49a04917..c1fda62444 100644
--- a/arch/avr/src/atmega/atmega_lowconsole.c
+++ b/arch/avr/src/atmega/atmega_lowconsole.c
@@ -280,7 +280,7 @@ void usart0_configure(void)
 
 #if CONFIG_USART0_PARITY == 1
   ucsr0c |= ((1 << UPM01) | (1 << UPM00)); /* Odd parity */
-#else
+#elif CONFIG_USART0_PARITY == 2
   ucsr0c |= (1 << UPM00);                  /* Even parity */
 #endif
 
@@ -357,7 +357,7 @@ void usart1_configure(void)
 
 #if CONFIG_USART1_PARITY == 1
   ucsr1c |= ((1 << UPM11) | (1 << UPM10)); /* Odd parity */
-#else
+#elif CONFIG_USART1_PARITY == 2
   ucsr1c |= (1 << UPM11);                  /* Even parity */
 #endif