diff --git a/core/net/rpl/rpl-ext-header.c b/core/net/rpl/rpl-ext-header.c
index e0804bbf1..171f75722 100644
--- a/core/net/rpl/rpl-ext-header.c
+++ b/core/net/rpl/rpl-ext-header.c
@@ -381,7 +381,7 @@ insert_srh_header(void)
   cmpri = 15;
   cmpre = 15;
 
-  if(node != NULL && node == root_node) {
+  if(node == root_node) {
     PRINTF("RPL: SRH no need to insert SRH\n");
     return 0;
   }
diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index f31fd616f..02f1d2244 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -1348,7 +1348,6 @@ dao_ack_output(rpl_instance_t *instance, uip_ipaddr_t *dest, uint8_t sequence,
   PRINT6ADDR(dest);
   PRINTF(" with status %d\n", status);
 
-  uip_ext_len = 0;
   buffer = UIP_ICMP_PAYLOAD;
 
   buffer[0] = instance->instance_id;