diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspSerial.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspSerial.java
index dc4c45600..ad2b0ffa5 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspSerial.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspSerial.java
@@ -46,6 +46,7 @@ import se.sics.cooja.mspmote.MspMoteTimeEvent;
 import se.sics.mspsim.core.IOUnit;
 import se.sics.mspsim.core.USART;
 import se.sics.mspsim.core.USARTListener;
+import se.sics.mspsim.core.USARTSource;
 
 /**
  * @author Fredrik Osterlind
@@ -73,13 +74,9 @@ public class MspSerial extends SerialUI implements SerialPort {
     if (ioUnit instanceof USART) {
       usart = (USART) ioUnit;
       usart.setUSARTListener(new USARTListener() {
-        public void dataReceived(USART arg0, int arg1) {
-          MspSerial.this.dataReceived(arg1);
-        }
-        public void stateChanged(int state) {
-          if (state == USARTListener.RXFLAG_CLEARED) {
-            /*tryWriteNextByte();*/
-          }
+        @Override
+        public void dataReceived(USARTSource source, int data) {
+          MspSerial.this.dataReceived(data);
         }
       });
     }
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TR1001Radio.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TR1001Radio.java
index 03d7cbe1e..d61d4994b 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TR1001Radio.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TR1001Radio.java
@@ -31,18 +31,8 @@
 
 package se.sics.cooja.mspmote.interfaces;
 
-import java.awt.BorderLayout;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.ArrayDeque;
 import java.util.Collection;
-import java.util.Observable;
-import java.util.Observer;
-
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
 
 import org.apache.log4j.Logger;
 import org.jdom.Element;
@@ -62,6 +52,7 @@ import se.sics.cooja.mspmote.MspMoteTimeEvent;
 import se.sics.mspsim.core.IOUnit;
 import se.sics.mspsim.core.USART;
 import se.sics.mspsim.core.USARTListener;
+import se.sics.mspsim.core.USARTSource;
 
 /**
  * TR1001 radio interface on ESB platform.
@@ -200,7 +191,7 @@ public class TR1001Radio extends Radio implements USARTListener, CustomDataRadio
   }
 
   /* USART listener support */
-  public void dataReceived(USART source, int data) {
+  public void dataReceived(USARTSource source, int data) {
     if (!isTransmitting()) {
       /* New transmission discovered */
       /*logger.info("----- NEW TR1001 TRANSMISSION DETECTED -----");*/
@@ -253,9 +244,6 @@ public class TR1001Radio extends Radio implements USARTListener, CustomDataRadio
     }
   }
 
-  public void stateChanged(int state) {
-  }
-
   /* General radio support */
   public boolean isTransmitting() {
     return isTransmitting;
diff --git a/tools/mspsim/mspsim.jar b/tools/mspsim/mspsim.jar
index 27522fc32..1666d4385 100644
Binary files a/tools/mspsim/mspsim.jar and b/tools/mspsim/mspsim.jar differ
diff --git a/tools/mspsim/scripts/autorun.sc b/tools/mspsim/scripts/autorun.sc
index d9ffc6680..19bcd4a4f 100644
--- a/tools/mspsim/scripts/autorun.sc
+++ b/tools/mspsim/scripts/autorun.sc
@@ -8,7 +8,8 @@
 # contikichecker
 
 #start the nodegui service
-service controlgui start
-service nodegui start
-#service stackchart start
+service -f controlgui start
+service -f nodegui start
+service -f serialgui start
+#service -f stackchart start
 start