diff --git a/cpu/avr/dev/usb/rndis/rndis.c b/cpu/avr/dev/usb/rndis/rndis.c
index 87e6d15ef..ef168caee 100644
--- a/cpu/avr/dev/usb/rndis/rndis.c
+++ b/cpu/avr/dev/usb/rndis/rndis.c
@@ -166,7 +166,7 @@ rndis_stat_t rndis_stat;
 
 uint8_t schedule_interrupt = 0;
 
-uint64_t rndis_ethernet_addr = 0x203478928323UL;
+uint64_t rndis_ethernet_addr = 0x203478928323ULL;
 
 //_____ D E C L A R A T I O N ______________________________________________
 
diff --git a/cpu/avr/dev/usb/rndis/rndis_task.c b/cpu/avr/dev/usb/rndis/rndis_task.c
index 93f64c78b..b2a04ebcf 100644
--- a/cpu/avr/dev/usb/rndis/rndis_task.c
+++ b/cpu/avr/dev/usb/rndis/rndis_task.c
@@ -95,7 +95,6 @@ char usb_busy = 0;
 
 static struct etimer et;
 static struct timer flood_timer;
-static uint16_t iad_fail_timeout, rndis_fail_timeout;	
 
 static uint8_t doInit = 1;
 
@@ -130,6 +129,7 @@ PROCESS_THREAD(rndis_process, ev, data_proc)
 		   have a system that does not support IAD (winXP). If so
 		   count the timeout then switch to just network interface. */
 #if 0
+static uint16_t iad_fail_timeout, rndis_fail_timeout;	
 		if (usb_mode == rndis_debug) {
 			//If we have timed out, detach
 			if (iad_fail_timeout == IAD_TIMEOUT_DETACH) {
@@ -232,6 +232,7 @@ PROCESS_THREAD(rndis_process, ev, data_proc)
 					//Wait until timer expiers
 					usb_busy = 1;
 					etimer_set(&et, flood_timer.interval - timediff);
+//Try commenting out the next line if Jackdaw stops RF transmission in Windows after a 5 minute idle period - dak
 					PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));     
 
 					//Reselect endpoint in case we lost it
diff --git a/cpu/avr/dev/usb/serial/cdc_task.c b/cpu/avr/dev/usb/serial/cdc_task.c
index 731db433e..14f2d1649 100644
--- a/cpu/avr/dev/usb/serial/cdc_task.c
+++ b/cpu/avr/dev/usb/serial/cdc_task.c
@@ -57,6 +57,7 @@
 #include "sicslow_ethernet.h"
 #include "radio.h"
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <avr/pgmspace.h>
 #include <avr/eeprom.h>
@@ -222,8 +223,8 @@ void menu_process(char c)
 				//If valid input, change it
 				if (tempchannel) {
 					radio_set_operating_channel(tempchannel);
-					eeprom_write_byte(9, tempchannel);   //Write channel
-					eeprom_write_byte(10, ~tempchannel); //Bit inverse as check
+					eeprom_write_byte((uint8_t *) 9, tempchannel);   //Write channel
+					eeprom_write_byte((uint8_t *)10, ~tempchannel); //Bit inverse as check
 				}
 
 				menustate = normal;
diff --git a/cpu/avr/dev/usb/serial/uart_usb_lib.h b/cpu/avr/dev/usb/serial/uart_usb_lib.h
index 5097b5a27..233c800f3 100644
--- a/cpu/avr/dev/usb/serial/uart_usb_lib.h
+++ b/cpu/avr/dev/usb/serial/uart_usb_lib.h
@@ -77,6 +77,7 @@ int  uart_usb_putchar(int);
 void  uart_usb_flush(void);
 bit   uart_usb_test_hit(void);
 char uart_usb_getchar(void);
+void uart_usb_set_stdout(void);
 
 /** @} **/
 
diff --git a/cpu/avr/dev/usb/storage/avr_flash.h b/cpu/avr/dev/usb/storage/avr_flash.h
index 5c0c8c99e..a9a6474a6 100644
--- a/cpu/avr/dev/usb/storage/avr_flash.h
+++ b/cpu/avr/dev/usb/storage/avr_flash.h
@@ -125,8 +125,10 @@ Ctrl_status    avrf_write_10( U32 addr , U16 nb_sector );
 #else
 #include "usb_drv.h"    // In this case the driver must be known for the USB access
 #endif
-Ctrl_status avr_usb_read( void );
-Ctrl_status avr_usb_write( void );
+//Ctrl_status avr_usb_read( void );
+//Ctrl_status avr_usb_write( void );
+Ctrl_status avrf_usb_read( void );
+Ctrl_status avrf_usb_write( void );
 
 
 
diff --git a/cpu/avr/dev/usb/storage/ctrl_access.c b/cpu/avr/dev/usb/storage/ctrl_access.c
index 9dd2dcb9c..5b16565b1 100644
--- a/cpu/avr/dev/usb/storage/ctrl_access.c
+++ b/cpu/avr/dev/usb/storage/ctrl_access.c
@@ -57,6 +57,7 @@
 
 #include "config.h"
 #include "storage/ctrl_access.h"
+#include "avr_flash.h"
 
 
 //_____ D E F I N I T I O N S ______________________________________________
@@ -465,6 +466,7 @@ Bool  mem_removal( U8 lun )
 //!
 //! @return pointer to code string
 //!
+#if 0         //not used anywhere and the FLASH attribute causes a compilation warning - dak
 U8 FLASH*  mem_name( U8 lun )
 {
    switch( lun )
@@ -517,6 +519,7 @@ U8 FLASH*  mem_name( U8 lun )
    }
    return 0;   // Remove compiler warning
 }
+#endif /* 0 */
 
 //************************************************************************************
 //!----------- Listing of READ/WRITE interface with MODE ACCESS REGISTER -------------
@@ -536,7 +539,7 @@ U8 FLASH*  mem_name( U8 lun )
 //!
 Ctrl_status    memory_2_usb( U8 lun , U32 addr , U16 nb_sector )
 {
-   Ctrl_status status;
+   Ctrl_status status=0;
 
    switch( lun )
    {
@@ -629,7 +632,7 @@ Ctrl_status    memory_2_usb( U8 lun , U32 addr , U16 nb_sector )
 //!
 Ctrl_status    usb_2_memory( U8 lun , U32 addr , U16 nb_sector )
 {
-   Ctrl_status status;
+   Ctrl_status status=0;
 
    switch( lun )
    {