diff --git a/core/lib/trickle-timer.c b/core/lib/trickle-timer.c
old mode 100755
new mode 100644
diff --git a/core/lib/trickle-timer.h b/core/lib/trickle-timer.h
old mode 100755
new mode 100644
index c7c004748..d32a3358e
--- a/core/lib/trickle-timer.h
+++ b/core/lib/trickle-timer.h
@@ -437,7 +437,7 @@ uint8_t trickle_timer_set(struct trickle_timer *tt,
  * to reset a timer manually. Instead, in response to events or inconsistencies,
  * the corresponding functions must be used
  */
-#define trickle_timer_stop(tt) ctimer_stop((tt)->ct)
+#define trickle_timer_stop(tt) ctimer_stop(&((tt)->ct))
 
 /**
  * \brief      To be called by the protocol when it hears a consistent
diff --git a/core/net/uipopt.h b/core/net/uipopt.h
index bf3097a0a..7c9939003 100644
--- a/core/net/uipopt.h
+++ b/core/net/uipopt.h
@@ -281,15 +281,15 @@
  */
 
 /**
- * Toggles whether UDP support should be compiled in or not.
+ * Toggles whether TCP support should be compiled in or not.
  *
  * \hideinitializer
  */
 #ifdef UIP_CONF_TCP
 #define UIP_TCP (UIP_CONF_TCP)
-#else /* UIP_CONF_UDP */
+#else /* UIP_CONF_TCP */
 #define UIP_TCP           1
-#endif /* UIP_CONF_UDP */
+#endif /* UIP_CONF_TCP */
 
 /**
  * Determines if support for opening connections from uIP should be