diff --git a/apps/json-resource/generic_resource.c b/apps/json-resource/generic_resource.c
index 528ffa368..842752362 100644
--- a/apps/json-resource/generic_resource.c
+++ b/apps/json-resource/generic_resource.c
@@ -46,8 +46,7 @@
 #include <string.h>
 #include "contiki.h"
 #include "jsonparse.h"
-/* Only coap 13 for now */
-#include "er-coap-13.h"
+#include "er-coap.h"
 #include "generic_resource.h"
 
 /* Error-handling macro */
@@ -125,7 +124,8 @@ void generic_handler
   const uint8_t  *bytes  = NULL;
   const uint16_t *accept = NULL;
   uint16_t a_ctype = REST.type.APPLICATION_JSON;
-  uint16_t c_ctype = REST.get_header_content_type (request);
+  uint16_t c_ctype;
+  n_acc = REST.get_header_content_type (request, &c_ctype);
 
   /* Seems like accepted type is currently unsupported? */
   n_acc = REST.get_header_accept (request, &accept);
diff --git a/apps/time/resource_gmtime.c b/apps/time/resource_gmtime.c
index b16be9794..ce9113e86 100644
--- a/apps/time/resource_gmtime.c
+++ b/apps/time/resource_gmtime.c
@@ -14,8 +14,7 @@
 #include "time.h"
 #include "time_resource.h"
 #include "jsonparse.h"
-/* Only coap 13 for now */
-#include "er-coap-13.h"
+#include "er-coap.h"
 #include "generic_resource.h"
 
 size_t time_to_string (const char *name, uint8_t is_json, char *buf, size_t bs)
diff --git a/apps/time/time_resource.h b/apps/time/time_resource.h
index 84a970021..40bd5aea8 100644
--- a/apps/time/time_resource.h
+++ b/apps/time/time_resource.h
@@ -17,7 +17,7 @@
 #ifndef time_resource_h
 #define time_resource_h
 #include "contiki.h"
-#include "erbium.h"
+#include "rest-engine.h"
 
 extern resource_t resource_timestamp;
 extern resource_t resource_localtime;
diff --git a/examples/osd/arduino-sketch/sketch.pde b/examples/osd/arduino-sketch/sketch.pde
index 8874c056a..be630437c 100644
--- a/examples/osd/arduino-sketch/sketch.pde
+++ b/examples/osd/arduino-sketch/sketch.pde
@@ -23,6 +23,7 @@ uint16_t analog5_voltage = 0;
 
 void setup (void)
 {
+    arduino_pwm_timer_init ();
     rest_init_engine ();
     rest_activate_resource (&resource_led_pwm);
     rest_activate_resource (&resource_led_period);