diff --git a/.gitignore b/.gitignore
index 20213282de7b8731809aa9b439f63ae3b49819e0..32f420ef469dbd42c3f2877e2aed8e94ce2c1705 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,8 +12,7 @@
 *~
 obj_*
 Makefile.target
-doc/html
-doc/latex
+tools/doxygen/html
 patches-*
 tools/tunslip
 tools/tunslip6
diff --git a/examples/6tisch/sixtop/node-sixtop.c b/examples/6tisch/sixtop/node-sixtop.c
index 84598d331f237dc7d1901c8e7c173133ac0a6f4a..4c60db3a704aaf291ff7c13b0712e9702e945750 100755
--- a/examples/6tisch/sixtop/node-sixtop.c
+++ b/examples/6tisch/sixtop/node-sixtop.c
@@ -63,7 +63,7 @@ AUTOSTART_PROCESSES(&node_process);
 /*---------------------------------------------------------------------------*/
 PROCESS_THREAD(node_process, ev, data)
 {
-  int is_coordinator;
+  static int is_coordinator;
   static int added_num_of_links = 0;
   static struct etimer et;
   struct tsch_neighbor *n;
diff --git a/examples/rpl-udp/README.md b/examples/rpl-udp/README.md
index 79ae868409ce8ab28dba11ba31140673e4f39525..2d944360fb106b23980fa84afec155d3463ab85c 100644
--- a/examples/rpl-udp/README.md
+++ b/examples/rpl-udp/README.md
@@ -7,4 +7,5 @@ send a UDP request periodically, that simply includes a counter as payload.
 When receiving a request, The server sends a response with the same counter
 back to the originator.
 
-The simulation files show example networks, for sky motes and for cooja motes.
+The `.csc` files show example networks in the Cooja simulator, for sky motes and
+for cooja motes.
diff --git a/tools/cooja b/tools/cooja
index 53f8a093ed2c84c90a426f27efbf32e754619c9e..8799528a5851f7e5af394f3f38e4a82b378e67af 160000
--- a/tools/cooja
+++ b/tools/cooja
@@ -1 +1 @@
-Subproject commit 53f8a093ed2c84c90a426f27efbf32e754619c9e
+Subproject commit 8799528a5851f7e5af394f3f38e4a82b378e67af