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 1e0662046..19971f741 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
@@ -220,7 +220,7 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
     this.myCpu.setMonitorExec(true);
     this.myCpu.setTrace(0); /* TODO Enable */
 
-    int[] memory = myCpu.getMemory();
+    int[] memory = myCpu.memory;
     logger.info("Loading firmware from: " + fileELF.getAbsolutePath());
     GUI.setProgressMessage("Loading " + fileELF.getName());
     node.loadFirmware(((MspMoteType)getType()).getELF(), memory);
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteMemory.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteMemory.java
index bd8b8e173..5c76b4696 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteMemory.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteMemory.java
@@ -37,6 +37,7 @@ import se.sics.cooja.AddressMemory;
 import se.sics.cooja.Mote;
 import se.sics.cooja.MoteMemory;
 import se.sics.mspsim.core.MSP430;
+import se.sics.mspsim.core.Memory.AccessMode;
 import se.sics.mspsim.core.Memory.AccessType;
 import se.sics.mspsim.util.MapEntry;
 
@@ -199,12 +200,12 @@ public class MspMoteMemory implements MoteMemory, AddressMemory {
     }
 
     @Override
-    public void notifyReadAfter(int address, int mode, AccessType type) {
+    public void notifyReadAfter(int address, AccessMode mode, AccessType type) {
         mm.memoryChanged(MspMoteMemory.this, MemoryEventType.READ, address);
     }
 
     @Override
-    public void notifyWriteAfter(int dstAddress, int data, int mode) {
+    public void notifyWriteAfter(int dstAddress, int data, AccessMode mode) {
         mm.memoryChanged(MspMoteMemory.this, MemoryEventType.WRITE, dstAddress);
     }
   }
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspDebugOutput.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspDebugOutput.java
index 5ffe91c1d..0fe83ec6c 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspDebugOutput.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspDebugOutput.java
@@ -81,7 +81,7 @@ public class MspDebugOutput extends Log {
     this.mote.getCPU().addWatchPoint(mem.getVariableAddress(CONTIKI_POINTER),
         memoryMonitor = new MemoryMonitor.Adapter() {
         @Override
-        public void notifyWriteAfter(int adr, int data, int mode) {
+        public void notifyWriteAfter(int adr, int data, Memory.AccessMode mode) {
           String msg = extractString(mem, data);
           if (msg != null && msg.length() > 0) {
             lastLog = "DEBUG: " + msg;
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.java
index 8f4568607..b87227312 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.java
@@ -42,6 +42,7 @@ import se.sics.cooja.Mote;
 import se.sics.cooja.interfaces.MoteID;
 import se.sics.cooja.mspmote.MspMote;
 import se.sics.cooja.mspmote.MspMoteMemory;
+import se.sics.mspsim.core.Memory;
 import se.sics.mspsim.core.MemoryMonitor;
 
 /**
@@ -112,7 +113,7 @@ public class MspMoteID extends MoteID {
 		    memoryMonitor = new MemoryMonitor.Adapter() {
 
 		        @Override
-		        public void notifyWriteAfter(int dstAddress, int data, int mode) {
+		        public void notifyWriteAfter(int dstAddress, int data, Memory.AccessMode mode) {
 		            byte[] id = new byte[2];
 		            id[0] = (byte) (moteID & 0xff);
 		            id[1] = (byte) ((moteID >> 8) & 0xff);
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspBreakpoint.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspBreakpoint.java
index f834e6a06..4735d4069 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspBreakpoint.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/plugins/MspBreakpoint.java
@@ -133,7 +133,7 @@ public class MspBreakpoint implements Watchpoint {
   private void createMonitor() {
     memoryMonitor = new MemoryMonitor.Adapter() {
       @Override
-      public void notifyReadBefore(int addr, int mode, Memory.AccessType type) {
+      public void notifyReadBefore(int addr, Memory.AccessMode mode, Memory.AccessType type) {
         if (type != Memory.AccessType.EXECUTE) {
           return;
         }