diff --git a/Makefile b/Makefile
index 96c03b3..f8d2d88 100644
--- a/Makefile
+++ b/Makefile
@@ -9,14 +9,14 @@ CONTIKI_WITH_RPL = 0
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" -DVERSION='\"$(VERSION)\"'
 CFLAGS += -Wall -Wno-pointer-sign -DLWM2M_CLIENT
 CFLAGS += -I$(LWM2M_DIR)/api/include
+CFLAGS += -I$(LWM2M_DIR)/core/src/erbium/
 
 ifneq (,$(filter  $(TARGET),seedeye mikro-e))
   CFLAGS += -fno-short-double
   LDFLAGS += -Wl,--defsym,_min_heap_size=64000
 endif
 
-APPS += er-coap
-APPS += rest-engine
+APPS += erbium
 APPS += client
 APPS += common
 APPS += jsmn
diff --git a/lwm2m-client-button-sensor.c b/lwm2m-client-button-sensor.c
index f824ef9..3e78cea 100644
--- a/lwm2m-client-button-sensor.c
+++ b/lwm2m-client-button-sensor.c
@@ -171,7 +171,7 @@ PROCESS_THREAD(lwm2m_client, ev, data)
 		static int WaitTime;
 		WaitTime = AwaStaticClient_Process(client);
 		etimer_set(&et, (WaitTime * CLOCK_SECOND) / 1000);
-		PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et) || (ev == sensors_event));
+		PROCESS_YIELD();
 
 		if (data == &button_sensor)
 		{