diff --git a/examples/slip-radio/slip-radio.c b/examples/slip-radio/slip-radio.c
index 21779a3dc..b39032d96 100644
--- a/examples/slip-radio/slip-radio.c
+++ b/examples/slip-radio/slip-radio.c
@@ -187,8 +187,8 @@ slip_radio_cmd_handler(const uint8_t *data, int len)
       }
       return 1;
     }
-  } else if(uip_buf[0] == '?') {
-    LOG_DBG("Got request message of type %c\n", uip_buf[1]);
+  } else if(data[0] == '?') {
+    LOG_DBG("Got request message of type %c\n", data[1]);
     if(data[1] == 'M') {
       /* this is just a test so far... just to see if it works */
       uip_buf[0] = '!';
@@ -226,8 +226,9 @@ slip_radio_cmd_handler(const uint8_t *data, int len)
 static void
 slip_input_callback(void)
 {
-  LOG_DBG("SR-SIN: %u '%c%c'\n", uip_len, uip_buf[0], uip_buf[1]);
-  if(!cmd_input(uip_buf, uip_len)) {
+  LOG_DBG("SR-SIN: %u '%c%c'\n", uip_len,
+          uip_buf[UIP_LLH_LEN], uip_buf[UIP_LLH_LEN + 1]);
+  if(!cmd_input(&uip_buf[UIP_LLH_LEN], uip_len)) {
     cmd_send((uint8_t *)"EUnknown command", 16);
   }
   uip_clear_buf();
diff --git a/os/services/ip64/ip64-slip-interface.c b/os/services/ip64/ip64-slip-interface.c
index 7ad4d4789..10422f2c7 100644
--- a/os/services/ip64/ip64-slip-interface.c
+++ b/os/services/ip64/ip64-slip-interface.c
@@ -57,24 +57,24 @@ static void
 input_callback(void)
 {
   /*PRINTF("SIN: %u\n", uip_len);*/
-  if(uip_buf[0] == '!') {
-    PRINTF("Got configuration message of type %c\n", uip_buf[1]);
+  if(uip_buf[UIP_LLH_LEN] == '!') {
+    PRINTF("Got configuration message of type %c\n", uip_buf[UIP_LLH_LEN + 1]);
     uip_clear_buf();
 #if 0
-    if(uip_buf[1] == 'P') {
+    if(uip_buf[UIP_LLH_LEN + 1] == 'P') {
       uip_ipaddr_t prefix;
       /* Here we set a prefix !!! */
       memset(&prefix, 0, 16);
-      memcpy(&prefix, &uip_buf[2], 8);
+      memcpy(&prefix, &uip_buf[UIP_LLH_LEN + 2], 8);
       PRINTF("Setting prefix ");
       PRINT6ADDR(&prefix);
       PRINTF("\n");
       set_prefix_64(&prefix);
     }
 #endif
-  } else if(uip_buf[0] == '?') {
-    PRINTF("Got request message of type %c\n", uip_buf[1]);
-    if(uip_buf[1] == 'M') {
+  } else if(uip_buf[UIP_LLH_LEN] == '?') {
+    PRINTF("Got request message of type %c\n", uip_buf[UIP_LLH_LEN + 1]);
+    if(uip_buf[UIP_LLH_LEN + 1] == 'M') {
       const char *hexchar = "0123456789abcdef";
       int j;
       /* this is just a test so far... just to see if it works */
@@ -84,8 +84,7 @@ input_callback(void)
         uip_buf[3 + j * 2] = hexchar[uip_lladdr.addr[j] & 15];
       }
       uip_len = 18;
-      slip_send();
-      
+      slip_write(uip_buf, uip_len);
     }
     uip_clear_buf();
   } else {
@@ -147,6 +146,3 @@ const struct uip_fallback_interface ip64_slip_interface = {
   init, output
 };
 /*---------------------------------------------------------------------------*/
-
-
-
diff --git a/os/services/rpl-border-router/embedded/slip-bridge.c b/os/services/rpl-border-router/embedded/slip-bridge.c
index cb85793f0..c40447d7f 100644
--- a/os/services/rpl-border-router/embedded/slip-bridge.c
+++ b/os/services/rpl-border-router/embedded/slip-bridge.c
@@ -62,7 +62,7 @@ request_prefix(void)
   uip_buf[0] = '?';
   uip_buf[1] = 'P';
   uip_len = 2;
-  slip_send();
+  slip_write(uip_buf, uip_len);
   uip_clear_buf();
 }
 /*---------------------------------------------------------------------------*/
@@ -70,22 +70,27 @@ static void
 slip_input_callback(void)
 {
   LOG_DBG("SIN: %u\n", uip_len);
-  if(uip_buf[0] == '!') {
-    LOG_INFO("Got configuration message of type %c\n", uip_buf[1]);
-    uip_clear_buf();
-    if(uip_buf[1] == 'P') {
+  if(uip_buf[UIP_LLH_LEN] == '!') {
+    LOG_INFO("Got configuration message of type %c\n",
+             uip_buf[UIP_LLH_LEN + 1]);
+    if(uip_buf[UIP_LLH_LEN + 1] == 'P') {
       uip_ipaddr_t prefix;
       /* Here we set a prefix !!! */
       memset(&prefix, 0, 16);
-      memcpy(&prefix, &uip_buf[2], 8);
+      memcpy(&prefix, &uip_buf[UIP_LLH_LEN + 2], 8);
+
+      uip_clear_buf();
+
       LOG_INFO("Setting prefix ");
       LOG_INFO_6ADDR(&prefix);
       LOG_INFO_("\n");
       set_prefix_64(&prefix);
     }
-  } else if(uip_buf[0] == '?') {
-    LOG_INFO("Got request message of type %c\n", uip_buf[1]);
-    if(uip_buf[1] == 'M') {
+    uip_clear_buf();
+
+  } else if(uip_buf[UIP_LLH_LEN] == '?') {
+    LOG_INFO("Got request message of type %c\n", uip_buf[UIP_LLH_LEN + 1]);
+    if(uip_buf[UIP_LLH_LEN + 1] == 'M') {
       char *hexchar = "0123456789abcdef";
       int j;
       /* this is just a test so far... just to see if it works */
@@ -95,13 +100,14 @@ slip_input_callback(void)
         uip_buf[3 + j * 2] = hexchar[uip_lladdr.addr[j] & 15];
       }
       uip_len = 18;
-      slip_send();
+      slip_write(uip_buf, uip_len);
     }
     uip_clear_buf();
+  } else {
+    /* Save the last sender received over SLIP to avoid bouncing the
+       packet back if no route is found */
+    uip_ipaddr_copy(&last_sender, &UIP_IP_BUF->srcipaddr);
   }
-  /* Save the last sender received over SLIP to avoid bouncing the
-     packet back if no route is found */
-  uip_ipaddr_copy(&last_sender, &UIP_IP_BUF->srcipaddr);
 }
 /*---------------------------------------------------------------------------*/
 static void