diff --git a/apps/shell/shell-rime.c b/apps/shell/shell-rime.c
index 7fdb7d26f..2066a9d2f 100644
--- a/apps/shell/shell-rime.c
+++ b/apps/shell/shell-rime.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime.c,v 1.4 2008/07/02 14:08:06 adamdunkels Exp $
+ * $Id: shell-rime.c,v 1.5 2008/07/03 09:52:15 adamdunkels Exp $
  */
 
 /**
@@ -505,7 +505,7 @@ static const struct uc_callbacks uc_callbacks = {recv_uc};
 #endif /* WITH_DEBUG_COMMANDS */
 /*---------------------------------------------------------------------------*/
 static void
-recv_collect(rimeaddr_t *originator, u8_t seqno, u8_t hops)
+recv_collect(const rimeaddr_t *originator, u8_t seqno, u8_t hops)
 {
   struct collect_msg *collect_msg;
   rtimer_clock_t latency;
diff --git a/apps/shell/shell-sky.c b/apps/shell/shell-sky.c
index 9e6beb0f5..ad91ccea2 100644
--- a/apps/shell/shell-sky.c
+++ b/apps/shell/shell-sky.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-sky.c,v 1.7 2008/07/02 14:14:37 adamdunkels Exp $
+ * $Id: shell-sky.c,v 1.8 2008/07/03 09:52:15 adamdunkels Exp $
  */
 
 /**
@@ -49,6 +49,8 @@
 #include "dev/light.h"
 #include "dev/sht11.h"
 
+#include "cfs/cfs-coffee.h"
+
 #include "net/rime/timesynch.h"
 
 #include <stdio.h>
@@ -390,7 +392,7 @@ PROCESS_THREAD(shell_powerconv_process, ev, data)
 static void
 printpowergraph(struct power_msg *msg)
 {
-  int i, j;
+  int i;
   unsigned long avg_power;
   unsigned long time;
   char buf[MAX_POWERGRAPH];