diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java
index 7693d6010..89ac35fb0 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ESBMoteType.java,v 1.6 2009/03/09 16:03:58 fros4943 Exp $
+ * $Id: ESBMoteType.java,v 1.7 2009/03/11 08:42:07 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote;
@@ -148,7 +148,8 @@ public class ESBMoteType extends MspMoteType {
         try {
           CompileContiki.compile(
               cmd,
-              null /* No output file */,
+              null,
+              null /* Do not observe output firmware file */,
               getContikiSourceFile().getParentFile(),
               null,
               null,
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java
index c423ea12b..5e3689af4 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MspMoteType.java,v 1.26 2009/03/09 17:12:27 fros4943 Exp $
+ * $Id: MspMoteType.java,v 1.27 2009/03/11 08:42:07 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote;
@@ -217,7 +217,7 @@ public abstract class MspMoteType implements MoteType {
       fileSource = GUI.stripAbsoluteContikiPath(fileSource);
       element.setText(fileSource.getPath().replaceAll("\\\\", "/"));
       config.add(element);
-      element = new Element("command");
+      element = new Element("commands");
       element.setText(compileCommands);
       config.add(element);
     }
@@ -251,7 +251,7 @@ public abstract class MspMoteType implements MoteType {
         description = element.getText();
       } else if (name.equals("source")) {
         fileSource = new File(element.getText());
-      } else if (name.equals("command")) {
+      } else if (name.equals("commands")) {
         compileCommands = element.getText();
       } else if (name.equals("firmware")) {
         fileFirmware = new File(element.getText());
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java
index 51419a1b9..9a8293f38 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SkyMoteType.java,v 1.5 2009/03/09 16:03:58 fros4943 Exp $
+ * $Id: SkyMoteType.java,v 1.6 2009/03/11 08:42:07 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote;
@@ -148,7 +148,8 @@ public class SkyMoteType extends MspMoteType {
         try {
           CompileContiki.compile(
               cmd,
-              null /* No output file */,
+              null,
+              null /* Do not observe output firmware file */,
               getContikiSourceFile().getParentFile(),
               null,
               null,