diff --git a/tools/cooja/java/se/sics/cooja/plugins/EventListener.java b/tools/cooja/java/se/sics/cooja/plugins/EventListener.java
index 66057aa5b..4822d230a 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/EventListener.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/EventListener.java
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: EventListener.java,v 1.7 2008/02/07 10:47:56 fros4943 Exp $
+ * $Id: EventListener.java,v 1.8 2009/03/09 15:39:33 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
@@ -161,8 +161,10 @@ public class EventListener extends VisPlugin {
 
     for (MoteType moteType : simulationToControl.getMoteTypes()) {
       if (moteType instanceof ContikiMoteType) {
-        allInterfacesDups.addAll(((ContikiMoteType) moteType)
-            .getMoteInterfaces());
+        Class<? extends MoteInterface>[] arr = ((ContikiMoteType) moteType).getMoteInterfaceClasses();
+        for (Class<? extends MoteInterface> intf : arr) {
+          allInterfacesDups.add(intf);
+        }
       }
     }
     for (Class<? extends MoteInterface> moteTypeClass : allInterfacesDups) {
diff --git a/tools/cooja/java/se/sics/cooja/plugins/MoteInterfaceViewer.java b/tools/cooja/java/se/sics/cooja/plugins/MoteInterfaceViewer.java
index 5eee15913..9b9739542 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/MoteInterfaceViewer.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/MoteInterfaceViewer.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MoteInterfaceViewer.java,v 1.4 2008/10/28 14:09:25 fros4943 Exp $
+ * $Id: MoteInterfaceViewer.java,v 1.5 2009/03/09 15:39:33 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
@@ -43,7 +43,7 @@ import se.sics.cooja.*;
 /**
  * Mote Interface Viewer views information about a specific mote interface.
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 @ClassDescription("Mote Interface Viewer")
 @PluginType(PluginType.MOTE_PLUGIN)
diff --git a/tools/cooja/java/se/sics/cooja/plugins/SimControl.java b/tools/cooja/java/se/sics/cooja/plugins/SimControl.java
index e4a72d516..37250d30e 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/SimControl.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/SimControl.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SimControl.java,v 1.10 2008/12/04 12:46:42 fros4943 Exp $
+ * $Id: SimControl.java,v 1.11 2009/03/09 15:39:33 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
@@ -46,7 +46,7 @@ import se.sics.cooja.*;
 /**
  * The Control Panel is a simple control panel for simulations.
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 @ClassDescription("Control Panel")
 @PluginType(PluginType.SIM_STANDARD_PLUGIN)