diff --git a/examples/osd/triggerbaord/sketch.pde b/examples/osd/triggerbaord/sketch.pde
index b5781878d..c8d9765cd 100755
--- a/examples/osd/triggerbaord/sketch.pde
+++ b/examples/osd/triggerbaord/sketch.pde
@@ -75,6 +75,7 @@ int color_from_string (const char *name, const char *uri, const char *s)
     return 0;
 }
 
+#pragma GCC diagnostic ignored "-Wwrite-strings"
 GENERIC_RESOURCE
   ( red
   , RED_LED
@@ -101,6 +102,7 @@ GENERIC_RESOURCE
   , color_from_string
   , color_to_string
   );
+#pragma GCC diagnostic pop
 
 void setup (void)
 {
diff --git a/platform/osd-merkur-128/contiki-conf.h b/platform/osd-merkur-128/contiki-conf.h
index 638145710..553864b30 100644
--- a/platform/osd-merkur-128/contiki-conf.h
+++ b/platform/osd-merkur-128/contiki-conf.h
@@ -275,7 +275,6 @@ typedef unsigned short uip_stats_t;
 /* ************************************************************************** */
 #if UIP_CONF_IPV6_RPL
 
-#define UIP_CONF_ROUTER                 1
 #define UIP_CONF_ND6_SEND_RA            0
 #define UIP_CONF_ND6_REACHABLE_TIME     600000
 #define UIP_CONF_ND6_RETRANS_TIMER      10000