diff --git a/examples/osd/rpl-border-router/border-router.c b/examples/osd/rpl-border-router/border-router.c
index 3a13e61bb..28bd23064 100644
--- a/examples/osd/rpl-border-router/border-router.c
+++ b/examples/osd/rpl-border-router/border-router.c
@@ -51,6 +51,8 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "dev/leds.h"
+
 #define DEBUG DEBUG_NONE
 #include "net/uip-debug.h"
 
@@ -79,7 +81,7 @@ AUTOSTART_PROCESSES(&border_router_process,&webserver_nogui_process);
  */
 #define WEBSERVER_CONF_LOADTIME 0
 #define WEBSERVER_CONF_FILESTATS 0
-#define WEBSERVER_CONF_NEIGHBOR_STATUS 1
+#define WEBSERVER_CONF_NEIGHBOR_STATUS 0
 /* Adding links requires a larger RAM buffer. To avoid static allocation
  * the stack can be used for formatting; however tcp retransmissions
  * and multiple connections can result in garbled segments.
@@ -334,7 +336,7 @@ PROCESS_THREAD(border_router_process, ev, data)
   rpl_dag_t *dag;
 
   PROCESS_BEGIN();
-
+  leds_off(LEDS_RED);
 /* While waiting for the prefix to be sent through the SLIP connection, the future
  * border router can join an existing DAG as a parent or child, or acquire a default 
  * router that will later take precedence over the SLIP fallback interface.
diff --git a/platform/osd-merkur/params.c b/platform/osd-merkur/params.c
index 582dbe67f..9e22d412d 100644
--- a/platform/osd-merkur/params.c
+++ b/platform/osd-merkur/params.c
@@ -120,7 +120,7 @@ uint8_t eemem_domain_name[] EEMEM = PARAMS_DOMAINNAME;
 
 uint16_t eemem_nodeid EEMEM = PARAMS_NODEID;
 uint8_t eemem_channel[2] EEMEM = {CHANNEL_802_15_4, ~CHANNEL_802_15_4};
-uint16_t eemem_panid EEMEM = IEEE802154_PANID;
+uint16_t eemem_panid EEMEM = IEEE802154_CONF_PANID;
 uint16_t eemem_panaddr EEMEM = PARAMS_PANADDR;
 uint8_t eemem_txpower EEMEM = PARAMS_TXPOWER;
 
@@ -153,7 +153,7 @@ params_get_channel(void) {
     eeprom_write_block(&buffer,  &eemem_server_name, sizeof(eemem_server_name));
     for (i=0;i<sizeof(default_domain_name);i++) buffer[i] = pgm_read_byte_near(default_domain_name+i);
     eeprom_write_block(&buffer,  &eemem_domain_name, sizeof(eemem_domain_name));
-    eeprom_write_word(&eemem_panid  , IEEE802154_PANID);
+    eeprom_write_word(&eemem_panid  , IEEE802154_CONF_PANID);
     eeprom_write_word(&eemem_panaddr, PARAMS_PANADDR);
     eeprom_write_byte(&eemem_txpower, PARAMS_TXPOWER);
     eeprom_write_word(&eemem_nodeid, PARAMS_NODEID);