diff --git a/core/net/ip/uip.h b/core/net/ip/uip.h
index 792bec33b..27e5bef39 100644
--- a/core/net/ip/uip.h
+++ b/core/net/ip/uip.h
@@ -489,7 +489,7 @@ void uip_reass_over(void);
 /**
  * The uIP packet buffer.
  *
- * The uip_buf array is used to hold incoming and outgoing
+ * The uip_aligned_buf array is used to hold incoming and outgoing
  * packets. The device driver should place incoming data into this
  * buffer. When sending data, the device driver should read the link
  * level headers and the TCP/IP headers from this buffer. The size of
@@ -519,6 +519,8 @@ typedef union {
 } uip_buf_t;
 
 CCIF extern uip_buf_t uip_aligned_buf;
+
+/** Macro to access uip_aligned_buf as an array of bytes */
 #define uip_buf (uip_aligned_buf.u8)
 
 
diff --git a/core/net/rime/packetqueue.h b/core/net/rime/packetqueue.h
index 5ec581a6c..5956d67e8 100644
--- a/core/net/rime/packetqueue.h
+++ b/core/net/rime/packetqueue.h
@@ -78,7 +78,7 @@ struct packetqueue {
  *             This structure holds the state of a packet queue. It is
  *             an opaque structure with no user-visible elements. The
  *             function packetqueue_queuebuf() is used to extract a
- *             \ref queuebuf "queubuf" from the item. The function
+ *             "queubuf" from the item. The function
  *             packetqueue_ptr() is used to extract the opaque pointer
  *             that was registered with the
  *             packetqueue_enqueue_packetbuf() function.
diff --git a/core/sys/clock.h b/core/sys/clock.h
index 46232273e..4cbfdb223 100644
--- a/core/sys/clock.h
+++ b/core/sys/clock.h
@@ -57,7 +57,7 @@
  *
  * \note The clock library need in many cases not be used
  * directly. Rather, the \ref timer "timer library", \ref etimer
- * "event timers", or \ref trimer "rtimer library" should be used.
+ * "event timers", or \ref rtimer "rtimer library" should be used.
  *
  * \sa \ref timer "Timer library"
  * \sa \ref etimer "Event timers"
diff --git a/doc/uip6-doc.txt b/doc/uip6-doc.txt
index a933417c5..fa9e58d19 100644
--- a/doc/uip6-doc.txt
+++ b/doc/uip6-doc.txt
@@ -66,7 +66,7 @@ This part of the code is very similar to the \ref ipreass "IPv4 fragmentation co
 is not assumed to be a TCP packet. As a result, we use a different
 %timer to time-out reassembly if all fragments have not been received
 after #UIP_REASS_MAXAGE = 60s.
-\note Fragment reassembly is enabled if #UIP_CONF_REASSEMBLY is set to 1.
+\note Fragment reassembly is enabled if #UIP_REASSEMBLY is set to 1.
 \note We can only reassemble packet of at most #UIP_LINK_MTU = 1280
 bytes as we do not have larger buffers.
 
@@ -81,9 +81,9 @@ typedef union uip_ip6addr_t {
 \endcode
 
 We assume that each node has a <em>single interface</em> of type
-#uip_netif. 
+#uip_ds6_netif_t. 
 
-Each interface can have up to #UIP_NETIF_MAX_ADDRESSES unicast IPv6
+Each interface can have a configurable number of unicast IPv6
 addresses including its link-local address. It also has a
 solicited-node multicast address. We assume that the unicast
 addresses are obtained via \ref autoconf "stateless address autoconfiguration"