diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
index 19971f741..2f7fdaa50 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
@@ -481,7 +481,7 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
           String name = mapEntry.getName();
           return file + ":?:" + name;
         }
-        return String.format("*%02x", myCpu.reg[MSP430Constants.PC]);
+        return String.format("*%02x", pc);
       } catch (Exception e) {
         return null;
       }
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/ESBLED.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/ESBLED.java
index 6c21cb151..9dac2d3f7 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/ESBLED.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/ESBLED.java
@@ -68,7 +68,7 @@ public class ESBLED extends LED implements PortListener {
     /* Listen for port writes */
     IOUnit unit = this.mote.getCPU().getIOUnit("Port 2");
     if (unit instanceof IOPort) {
-      ((IOPort) unit).setPortListener(this);
+      ((IOPort) unit).addPortListener(this);
     }
   }
 
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/Exp5438LED.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/Exp5438LED.java
index 4bf039da3..be2fdfcb8 100755
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/Exp5438LED.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/Exp5438LED.java
@@ -72,7 +72,7 @@ public class Exp5438LED extends LED {
 
     IOUnit unit = mspMote.getCPU().getIOUnit("P1");
     if (unit instanceof IOPort) {
-      ((IOPort) unit).setPortListener(new PortListener() {
+      ((IOPort) unit).addPortListener(new PortListener() {
         public void portWrite(IOPort source, int data) {
           redOn = (data & Exp5438Node.LEDS_CONF_RED) != 0;
           yellowOn = (data & Exp5438Node.LEDS_CONF_YELLOW) != 0;
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 714e33969..6b0ee14a3 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
@@ -73,7 +73,7 @@ public class MspSerial extends SerialUI implements SerialPort {
     IOUnit ioUnit = this.mote.getCPU().getIOUnit(ioConfigString());
     if (ioUnit instanceof USARTSource) {
       usart = (USARTSource) ioUnit;
-      usart.setUSARTListener(new USARTListener() {
+      usart.addUSARTListener(new USARTListener() {
         public void dataReceived(USARTSource source, int data) {
           MspSerial.this.dataReceived(data);
         }
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyByteRadio.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyByteRadio.java
index 18e98f09e..a0b1db589 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyByteRadio.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyByteRadio.java
@@ -46,6 +46,7 @@ import se.sics.cooja.interfaces.Radio;
 import se.sics.cooja.mspmote.MspMote;
 import se.sics.cooja.mspmote.MspMoteTimeEvent;
 import se.sics.mspsim.chip.CC2420;
+import se.sics.mspsim.chip.ChannelListener;
 import se.sics.mspsim.chip.RFListener;
 import se.sics.mspsim.core.Chip;
 import se.sics.mspsim.core.OperatingModeListener;
@@ -89,7 +90,7 @@ public class SkyByteRadio extends Radio implements CustomDataRadio {
       throw new IllegalStateException("Mote is not equipped with a CC2420");
     }
 
-    cc2420.setRFListener(new RFListener() {
+    cc2420.addRFListener(new RFListener() {
       int len = 0;
       int expLen = 0;
       byte[] buffer = new byte[127 + 15];
@@ -158,8 +159,8 @@ public class SkyByteRadio extends Radio implements CustomDataRadio {
       }
     });
 
-    cc2420.setChannelListener(new CC2420.ChannelListener() {
-      public void changedChannel(int channel) {
+    cc2420.addChannelListener(new ChannelListener() {
+      public void channelChanged(int channel) {
         /* XXX Currently assumes zero channel switch time */
         lastEvent = RadioEvent.UNKNOWN;
         lastEventTime = SkyByteRadio.this.mote.getSimulation().getSimulationTime();
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyLED.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyLED.java
index da562f270..bb37ebf05 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyLED.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/SkyLED.java
@@ -69,7 +69,7 @@ public class SkyLED extends LED {
 
     IOUnit unit = mspMote.getCPU().getIOUnit("Port 5");
     if (unit instanceof IOPort) {
-      ((IOPort) unit).setPortListener(new PortListener() {
+      ((IOPort) unit).addPortListener(new PortListener() {
         public void portWrite(IOPort source, int data) {
           blueOn = (data & SkyNode.BLUE_LED) == 0;
           greenOn = (data & SkyNode.GREEN_LED) == 0;
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 d61d4994b..d873e579b 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
@@ -108,7 +108,7 @@ public class TR1001Radio extends Radio implements USARTListener, CustomDataRadio
     IOUnit usart = this.mote.getCPU().getIOUnit("USART 0");
     if (usart != null && usart instanceof USART) {
       radioUSART = (USART) usart;
-      radioUSART.setUSARTListener(this);
+      radioUSART.addUSARTListener(this);
     } else {
       throw new RuntimeException("Bad TR1001 IO: " + usart);
     }
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TyndallLED.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TyndallLED.java
index 9d7f0b902..ae71a7d50 100755
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TyndallLED.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TyndallLED.java
@@ -73,7 +73,7 @@ public class TyndallLED extends LED {
 
     IOUnit unit = mspMote.getCPU().getIOUnit("P7");
     if (unit instanceof IOPort) {
-      ((IOPort) unit).setPortListener(new PortListener() {
+      ((IOPort) unit).addPortListener(new PortListener() {
         public void portWrite(IOPort source, int data) {
           redOn = (data & TyndallNode.LEDS_CONF_RED) == 0;
           setChanged();
@@ -83,7 +83,7 @@ public class TyndallLED extends LED {
     }
     unit = mspMote.getCPU().getIOUnit("P8");
     if (unit instanceof IOPort) {
-      ((IOPort) unit).setPortListener(new PortListener() {
+      ((IOPort) unit).addPortListener(new PortListener() {
         public void portWrite(IOPort source, int data) {
           greenOn = (data & TyndallNode.LEDS_CONF_GREEN) == 0;
           setChanged();