diff --git a/core/block1.c b/core/block1.c
index 9178e348a..379742fc0 100644
--- a/core/block1.c
+++ b/core/block1.c
@@ -49,15 +49,15 @@
 // the maximum payload transferred by block1 we accumulate per server
 #define MAX_BLOCK1_SIZE 4096
 
-coap_status_t coap_block1_handler(lwm2m_block1_data_t ** pBlock1Data,
-                                  uint16_t mid,
-                                  uint8_t * buffer,
-                                  size_t length,
-                                  uint16_t blockSize,
-                                  uint32_t blockNum,
-                                  bool blockMore,
-                                  uint8_t ** outputBuffer,
-                                  size_t * outputLength)
+uint8_t coap_block1_handler(lwm2m_block1_data_t ** pBlock1Data,
+                            uint16_t mid,
+                            uint8_t * buffer,
+                            size_t length,
+                            uint16_t blockSize,
+                            uint32_t blockNum,
+                            bool blockMore,
+                            uint8_t ** outputBuffer,
+                            size_t * outputLength)
 {
     lwm2m_block1_data_t * block1Data = *pBlock1Data;;
 
diff --git a/core/bootstrap.c b/core/bootstrap.c
index 55f1aec27..611566b82 100644
--- a/core/bootstrap.c
+++ b/core/bootstrap.c
@@ -202,8 +202,8 @@ void bootstrap_step(lwm2m_context_t * contextP,
     }
 }
 
-coap_status_t bootstrap_handleFinish(lwm2m_context_t * context,
-                                     void * fromSessionH)
+uint8_t bootstrap_handleFinish(lwm2m_context_t * context,
+                               void * fromSessionH)
 {
     lwm2m_server_t * bootstrapServer;
 
@@ -294,7 +294,7 @@ lwm2m_status_t bootstrap_getStatus(lwm2m_context_t * contextP)
     return bs_status;
 }
 
-static coap_status_t prv_checkServerStatus(lwm2m_server_t * serverP)
+static uint8_t prv_checkServerStatus(lwm2m_server_t * serverP)
 {
     LOG_ARG("Initial status: %s", STR_STATUS(serverP->status));
 
@@ -367,13 +367,13 @@ static void prv_tagAllServer(lwm2m_context_t * contextP,
     }
 }
 
-coap_status_t bootstrap_handleCommand(lwm2m_context_t * contextP,
-                                      lwm2m_uri_t * uriP,
-                                      lwm2m_server_t * serverP,
-                                      coap_packet_t * message,
-                                      coap_packet_t * response)
+uint8_t bootstrap_handleCommand(lwm2m_context_t * contextP,
+                                lwm2m_uri_t * uriP,
+                                lwm2m_server_t * serverP,
+                                coap_packet_t * message,
+                                coap_packet_t * response)
 {
-    coap_status_t result;
+    uint8_t result;
     lwm2m_media_type_t format;
 
     LOG_ARG("Code: %02X", message->code);
@@ -510,11 +510,11 @@ coap_status_t bootstrap_handleCommand(lwm2m_context_t * contextP,
     return result;
 }
 
-coap_status_t bootstrap_handleDeleteAll(lwm2m_context_t * contextP,
-                                        void * fromSessionH)
+uint8_t bootstrap_handleDeleteAll(lwm2m_context_t * contextP,
+                                  void * fromSessionH)
 {
     lwm2m_server_t * serverP;
-    coap_status_t result;
+    uint8_t result;
     lwm2m_object_t * objectP;
 
     LOG("Entering");
diff --git a/core/er-coap-13/er-coap-13.h b/core/er-coap-13/er-coap-13.h
index 4913d1cd4..495f49e82 100644
--- a/core/er-coap-13/er-coap-13.h
+++ b/core/er-coap-13/er-coap-13.h
@@ -98,8 +98,8 @@
 
 /* Bitmap for set options */
 enum { OPTION_MAP_SIZE = sizeof(uint8_t) * 8 };
-#define SET_OPTION(packet, opt) ((packet)->options[opt / OPTION_MAP_SIZE] |= 1 << (opt % OPTION_MAP_SIZE))
-#define IS_OPTION(packet, opt) ((packet)->options[opt / OPTION_MAP_SIZE] & (1 << (opt % OPTION_MAP_SIZE)))
+#define SET_OPTION(packet, opt) {if (opt <= sizeof((packet)->options) * OPTION_MAP_SIZE) {(packet)->options[opt / OPTION_MAP_SIZE] |= 1 << (opt % OPTION_MAP_SIZE);}}
+#define IS_OPTION(packet, opt) ((opt <= sizeof((packet)->options) * OPTION_MAP_SIZE)?(packet)->options[opt / OPTION_MAP_SIZE] & (1 << (opt % OPTION_MAP_SIZE)):0)
 
 #ifndef MIN
 #define MIN(a, b) ((a) < (b)? (a) : (b))
diff --git a/core/internals.h b/core/internals.h
index d2b25e1a3..30d394246 100644
--- a/core/internals.h
+++ b/core/internals.h
@@ -246,21 +246,21 @@ int uri_getNumber(uint8_t * uriString, size_t uriLength);
 int uri_toString(lwm2m_uri_t * uriP, uint8_t * buffer, size_t bufferLen, uri_depth_t * depthP);
 
 // defined in objects.c
-coap_status_t object_readData(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, int * sizeP, lwm2m_data_t ** dataP);
-coap_status_t object_read(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_media_type_t * formatP, uint8_t ** bufferP, size_t * lengthP);
-coap_status_t object_write(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_media_type_t format, uint8_t * buffer, size_t length);
-coap_status_t object_create(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_media_type_t format, uint8_t * buffer, size_t length);
-coap_status_t object_execute(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, uint8_t * buffer, size_t length);
-coap_status_t object_delete(lwm2m_context_t * contextP, lwm2m_uri_t * uriP);
-coap_status_t object_discover(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, uint8_t ** bufferP, size_t * lengthP);
+uint8_t object_readData(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, int * sizeP, lwm2m_data_t ** dataP);
+uint8_t object_read(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_media_type_t * formatP, uint8_t ** bufferP, size_t * lengthP);
+uint8_t object_write(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_media_type_t format, uint8_t * buffer, size_t length);
+uint8_t object_create(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_media_type_t format, uint8_t * buffer, size_t length);
+uint8_t object_execute(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, uint8_t * buffer, size_t length);
+uint8_t object_delete(lwm2m_context_t * contextP, lwm2m_uri_t * uriP);
+uint8_t object_discover(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, uint8_t ** bufferP, size_t * lengthP);
 uint8_t object_checkReadable(lwm2m_context_t * contextP, lwm2m_uri_t * uriP);
 uint8_t object_checkNumeric(lwm2m_context_t * contextP, lwm2m_uri_t * uriP);
 bool object_isInstanceNew(lwm2m_context_t * contextP, uint16_t objectId, uint16_t instanceId);
 int object_getRegisterPayloadBufferLength(lwm2m_context_t * contextP);
 int object_getRegisterPayload(lwm2m_context_t * contextP, uint8_t * buffer, size_t length);
 int object_getServers(lwm2m_context_t * contextP, bool checkOnly);
-coap_status_t object_createInstance(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_data_t * dataP);
-coap_status_t object_writeInstance(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_data_t * dataP);
+uint8_t object_createInstance(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_data_t * dataP);
+uint8_t object_writeInstance(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_data_t * dataP);
 
 // defined in transaction.c
 lwm2m_transaction_t * transaction_new(void * sessionH, coap_method_t method, char * altPath, lwm2m_uri_t * uriP, uint16_t mID, uint8_t token_len, uint8_t* token);
@@ -271,12 +271,12 @@ bool transaction_handleResponse(lwm2m_context_t * contextP, void * fromSessionH,
 void transaction_step(lwm2m_context_t * contextP, time_t currentTime, time_t * timeoutP);
 
 // defined in management.c
-coap_status_t dm_handleRequest(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, coap_packet_t * message, coap_packet_t * response);
+uint8_t dm_handleRequest(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, coap_packet_t * message, coap_packet_t * response);
 
 // defined in observe.c
-coap_status_t observe_handleRequest(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, int size, lwm2m_data_t * dataP, coap_packet_t * message, coap_packet_t * response);
+uint8_t observe_handleRequest(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, int size, lwm2m_data_t * dataP, coap_packet_t * message, coap_packet_t * response);
 void observe_cancel(lwm2m_context_t * contextP, uint16_t mid, void * fromSessionH);
-coap_status_t observe_setParameters(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, lwm2m_attributes_t * attrP);
+uint8_t observe_setParameters(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, lwm2m_attributes_t * attrP);
 void observe_step(lwm2m_context_t * contextP, time_t currentTime, time_t * timeoutP);
 void observe_clear(lwm2m_context_t * contextP, lwm2m_uri_t * uriP);
 bool observe_handleNotify(lwm2m_context_t * contextP, void * fromSessionH, coap_packet_t * message, coap_packet_t * response);
@@ -284,7 +284,7 @@ void observe_remove(lwm2m_observation_t * observationP);
 lwm2m_observed_t * observe_findByUri(lwm2m_context_t * contextP, lwm2m_uri_t * uriP);
 
 // defined in registration.c
-coap_status_t registration_handleRequest(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, void * fromSessionH, coap_packet_t * message, coap_packet_t * response);
+uint8_t registration_handleRequest(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, void * fromSessionH, coap_packet_t * message, coap_packet_t * response);
 void registration_deregister(lwm2m_context_t * contextP, lwm2m_server_t * serverP);
 void registration_freeClient(lwm2m_client_t * clientP);
 uint8_t registration_start(lwm2m_context_t * contextP);
@@ -292,13 +292,13 @@ void registration_step(lwm2m_context_t * contextP, time_t currentTime, time_t *
 lwm2m_status_t registration_getStatus(lwm2m_context_t * contextP);
 
 // defined in packet.c
-coap_status_t message_send(lwm2m_context_t * contextP, coap_packet_t * message, void * sessionH);
+uint8_t message_send(lwm2m_context_t * contextP, coap_packet_t * message, void * sessionH);
 
 // defined in bootstrap.c
 void bootstrap_step(lwm2m_context_t * contextP, uint32_t currentTime, time_t* timeoutP);
-coap_status_t bootstrap_handleCommand(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, coap_packet_t * message, coap_packet_t * response);
-coap_status_t bootstrap_handleDeleteAll(lwm2m_context_t * context, void * fromSessionH);
-coap_status_t bootstrap_handleFinish(lwm2m_context_t * context, void * fromSessionH);
+uint8_t bootstrap_handleCommand(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, coap_packet_t * message, coap_packet_t * response);
+uint8_t bootstrap_handleDeleteAll(lwm2m_context_t * context, void * fromSessionH);
+uint8_t bootstrap_handleFinish(lwm2m_context_t * context, void * fromSessionH);
 uint8_t bootstrap_handleRequest(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, void * fromSessionH, coap_packet_t * message, coap_packet_t * response);
 void bootstrap_start(lwm2m_context_t * contextP);
 lwm2m_status_t bootstrap_getStatus(lwm2m_context_t * contextP);
@@ -317,7 +317,7 @@ int json_serialize(lwm2m_uri_t * uriP, int size, lwm2m_data_t * tlvP, uint8_t **
 int discover_serialize(lwm2m_context_t * contextP, lwm2m_uri_t * uriP, lwm2m_server_t * serverP, int size, lwm2m_data_t * dataP, uint8_t ** bufferP);
 
 // defined in block1.c
-coap_status_t coap_block1_handler(lwm2m_block1_data_t ** block1Data, uint16_t mid, uint8_t * buffer, size_t length, uint16_t blockSize, uint32_t blockNum, bool blockMore, uint8_t ** outputBuffer, size_t * outputLength);
+uint8_t coap_block1_handler(lwm2m_block1_data_t ** block1Data, uint16_t mid, uint8_t * buffer, size_t length, uint16_t blockSize, uint32_t blockNum, bool blockMore, uint8_t ** outputBuffer, size_t * outputLength);
 void free_block1_buffer(lwm2m_block1_data_t * block1Data);
 
 // defined in utils.c
diff --git a/core/management.c b/core/management.c
index 59bc3ce50..2a6c33bab 100644
--- a/core/management.c
+++ b/core/management.c
@@ -159,13 +159,13 @@ static int prv_readAttributes(multi_option_t * query,
     return 0;
 }
 
-coap_status_t dm_handleRequest(lwm2m_context_t * contextP,
-                                lwm2m_uri_t * uriP,
-                                lwm2m_server_t * serverP,
-                                coap_packet_t * message,
-                                coap_packet_t * response)
+uint8_t dm_handleRequest(lwm2m_context_t * contextP,
+                         lwm2m_uri_t * uriP,
+                         lwm2m_server_t * serverP,
+                         coap_packet_t * message,
+                         coap_packet_t * response)
 {
-    coap_status_t result;
+    uint8_t result;
     lwm2m_media_type_t format;
 
     LOG_ARG("Code: %02X, server status: %s", message->code, STR_STATUS(serverP->status));
diff --git a/core/objects.c b/core/objects.c
index aa6f1cfb6..983f904c0 100644
--- a/core/objects.c
+++ b/core/objects.c
@@ -63,7 +63,7 @@
 uint8_t object_checkReadable(lwm2m_context_t * contextP,
                              lwm2m_uri_t * uriP)
 {
-    coap_status_t result;
+    uint8_t result;
     lwm2m_object_t * targetP;
     lwm2m_data_t * dataP = NULL;
     int size;
@@ -94,7 +94,7 @@ uint8_t object_checkReadable(lwm2m_context_t * contextP,
 uint8_t object_checkNumeric(lwm2m_context_t * contextP,
                             lwm2m_uri_t * uriP)
 {
-    coap_status_t result;
+    uint8_t result;
     lwm2m_object_t * targetP;
     lwm2m_data_t * dataP = NULL;
     int size;
@@ -130,12 +130,12 @@ uint8_t object_checkNumeric(lwm2m_context_t * contextP,
     return result;
 }
 
-coap_status_t object_readData(lwm2m_context_t * contextP,
-                               lwm2m_uri_t * uriP,
-                               int * sizeP,
-                               lwm2m_data_t ** dataP)
+uint8_t object_readData(lwm2m_context_t * contextP,
+                        lwm2m_uri_t * uriP,
+                        int * sizeP,
+                        lwm2m_data_t ** dataP)
 {
-    coap_status_t result;
+    uint8_t result;
     lwm2m_object_t * targetP;
 
     LOG_URI(uriP);
@@ -199,13 +199,13 @@ coap_status_t object_readData(lwm2m_context_t * contextP,
     return result;
 }
 
-coap_status_t object_read(lwm2m_context_t * contextP,
-                          lwm2m_uri_t * uriP,
-                          lwm2m_media_type_t * formatP,
-                          uint8_t ** bufferP,
-                          size_t * lengthP)
+uint8_t object_read(lwm2m_context_t * contextP,
+                    lwm2m_uri_t * uriP,
+                    lwm2m_media_type_t * formatP,
+                    uint8_t ** bufferP,
+                    size_t * lengthP)
 {
-    coap_status_t result;
+    uint8_t result;
     lwm2m_data_t * dataP = NULL;
     int size = 0;
     int res;
@@ -232,13 +232,13 @@ coap_status_t object_read(lwm2m_context_t * contextP,
     return result;
 }
 
-coap_status_t object_write(lwm2m_context_t * contextP,
-                           lwm2m_uri_t * uriP,
-                           lwm2m_media_type_t format,
-                           uint8_t * buffer,
-                           size_t length)
+uint8_t object_write(lwm2m_context_t * contextP,
+                     lwm2m_uri_t * uriP,
+                     lwm2m_media_type_t format,
+                     uint8_t * buffer,
+                     size_t length)
 {
-    coap_status_t result = NO_ERROR;
+    uint8_t result = NO_ERROR;
     lwm2m_object_t * targetP;
     lwm2m_data_t * dataP = NULL;
     int size = 0;
@@ -272,10 +272,10 @@ coap_status_t object_write(lwm2m_context_t * contextP,
     return result;
 }
 
-coap_status_t object_execute(lwm2m_context_t * contextP,
-                             lwm2m_uri_t * uriP,
-                             uint8_t * buffer,
-                             size_t length)
+uint8_t object_execute(lwm2m_context_t * contextP,
+                       lwm2m_uri_t * uriP,
+                       uint8_t * buffer,
+                       size_t length)
 {
     lwm2m_object_t * targetP;
 
@@ -288,11 +288,11 @@ coap_status_t object_execute(lwm2m_context_t * contextP,
     return targetP->executeFunc(uriP->instanceId, uriP->resourceId, buffer, length, targetP);
 }
 
-coap_status_t object_create(lwm2m_context_t * contextP,
-                            lwm2m_uri_t * uriP,
-                            lwm2m_media_type_t format,
-                            uint8_t * buffer,
-                            size_t length)
+uint8_t object_create(lwm2m_context_t * contextP,
+                      lwm2m_uri_t * uriP,
+                      lwm2m_media_type_t format,
+                      uint8_t * buffer,
+                      size_t length)
 {
     lwm2m_object_t * targetP;
     lwm2m_data_t * dataP = NULL;
@@ -354,11 +354,11 @@ coap_status_t object_create(lwm2m_context_t * contextP,
     return result;
 }
 
-coap_status_t object_delete(lwm2m_context_t * contextP,
-                            lwm2m_uri_t * uriP)
+uint8_t object_delete(lwm2m_context_t * contextP,
+                      lwm2m_uri_t * uriP)
 {
     lwm2m_object_t * objectP;
-    coap_status_t result;
+    uint8_t result;
 
     LOG_URI(uriP);
     objectP = (lwm2m_object_t *)LWM2M_LIST_FIND(contextP->objectList, uriP->objectId);
@@ -401,13 +401,13 @@ coap_status_t object_delete(lwm2m_context_t * contextP,
     return result;
 }
 
-coap_status_t object_discover(lwm2m_context_t * contextP,
-                              lwm2m_uri_t * uriP,
-                              lwm2m_server_t * serverP,
-                              uint8_t ** bufferP,
-                              size_t * lengthP)
+uint8_t object_discover(lwm2m_context_t * contextP,
+                        lwm2m_uri_t * uriP,
+                        lwm2m_server_t * serverP,
+                        uint8_t ** bufferP,
+                        size_t * lengthP)
 {
-    coap_status_t result;
+    uint8_t result;
     lwm2m_object_t * targetP;
     lwm2m_data_t * dataP = NULL;
     int size = 0;
@@ -887,7 +887,7 @@ int object_getServers(lwm2m_context_t * contextP, bool checkOnly)
     return 0;
 }
 
-coap_status_t object_createInstance(lwm2m_context_t * contextP,
+uint8_t object_createInstance(lwm2m_context_t * contextP,
                                     lwm2m_uri_t * uriP,
                                     lwm2m_data_t * dataP)
 {
@@ -905,7 +905,7 @@ coap_status_t object_createInstance(lwm2m_context_t * contextP,
     return targetP->createFunc(lwm2m_list_newId(targetP->instanceList), dataP->value.asChildren.count, dataP->value.asChildren.array, targetP);
 }
 
-coap_status_t object_writeInstance(lwm2m_context_t * contextP,
+uint8_t object_writeInstance(lwm2m_context_t * contextP,
                             lwm2m_uri_t * uriP,
                             lwm2m_data_t * dataP)
 {
diff --git a/core/observe.c b/core/observe.c
index c8b46b528..403e92a26 100644
--- a/core/observe.c
+++ b/core/observe.c
@@ -153,13 +153,13 @@ static lwm2m_watcher_t * prv_getWatcher(lwm2m_context_t * contextP,
     return watcherP;
 }
 
-coap_status_t observe_handleRequest(lwm2m_context_t * contextP,
-                                    lwm2m_uri_t * uriP,
-                                    lwm2m_server_t * serverP,
-                                    int size,
-                                    lwm2m_data_t * dataP,
-                                    coap_packet_t * message,
-                                    coap_packet_t * response)
+uint8_t observe_handleRequest(lwm2m_context_t * contextP,
+                              lwm2m_uri_t * uriP,
+                              lwm2m_server_t * serverP,
+                              int size,
+                              lwm2m_data_t * dataP,
+                              coap_packet_t * message,
+                              coap_packet_t * response)
 {
     lwm2m_watcher_t * watcherP;
     uint32_t count;
@@ -308,10 +308,10 @@ void observe_clear(lwm2m_context_t * contextP,
     }
 }
 
-coap_status_t observe_setParameters(lwm2m_context_t * contextP,
-                                    lwm2m_uri_t * uriP,
-                                    lwm2m_server_t * serverP,
-                                    lwm2m_attributes_t * attrP)
+uint8_t observe_setParameters(lwm2m_context_t * contextP,
+                              lwm2m_uri_t * uriP,
+                              lwm2m_server_t * serverP,
+                              lwm2m_attributes_t * attrP)
 {
     uint8_t result;
     lwm2m_watcher_t * watcherP;
diff --git a/core/packet.c b/core/packet.c
index 82de96237..dc998d3b8 100644
--- a/core/packet.c
+++ b/core/packet.c
@@ -103,13 +103,13 @@ static void handle_reset(lwm2m_context_t * contextP,
 #endif
 }
 
-static coap_status_t handle_request(lwm2m_context_t * contextP,
-                                    void * fromSessionH,
-                                    coap_packet_t * message,
-                                    coap_packet_t * response)
+static uint8_t handle_request(lwm2m_context_t * contextP,
+                              void * fromSessionH,
+                              coap_packet_t * message,
+                              coap_packet_t * response)
 {
     lwm2m_uri_t * uriP;
-    coap_status_t result = COAP_IGNORE;
+    uint8_t result = COAP_IGNORE;
 
     LOG("Entering");
 	
@@ -198,11 +198,11 @@ static coap_status_t handle_request(lwm2m_context_t * contextP,
  * All rights reserved.
  */
 void lwm2m_handle_packet(lwm2m_context_t * contextP,
-                        uint8_t * buffer,
-                        int length,
-                        void * fromSessionH)
+                         uint8_t * buffer,
+                         int length,
+                         void * fromSessionH)
 {
-    coap_status_t coap_error_code = NO_ERROR;
+    uint8_t coap_error_code = NO_ERROR;
     static coap_packet_t message[1];
     static coap_packet_t response[1];
 
@@ -412,11 +412,11 @@ void lwm2m_handle_packet(lwm2m_context_t * contextP,
 }
 
 
-coap_status_t message_send(lwm2m_context_t * contextP,
-                           coap_packet_t * message,
-                           void * sessionH)
+uint8_t message_send(lwm2m_context_t * contextP,
+                     coap_packet_t * message,
+                     void * sessionH)
 {
-    coap_status_t result = COAP_500_INTERNAL_SERVER_ERROR;
+    uint8_t result = COAP_500_INTERNAL_SERVER_ERROR;
     uint8_t * pktBuffer;
     size_t pktBufferLen = 0;
     size_t allocLen;
diff --git a/core/registration.c b/core/registration.c
index 7ed6b2689..55d6ed8f8 100644
--- a/core/registration.c
+++ b/core/registration.c
@@ -465,7 +465,7 @@ uint8_t registration_start(lwm2m_context_t * contextP)
     uint8_t result;
 
     LOG_ARG("State: %s", STR_STATE(contextP->state));
-	
+
     result = COAP_NO_ERROR;
 
     targetP = contextP->serverList;
@@ -1020,13 +1020,13 @@ static int prv_getLocationString(uint16_t id,
     return index + result;
 }
 
-coap_status_t registration_handleRequest(lwm2m_context_t * contextP,
-                                          lwm2m_uri_t * uriP,
-                                          void * fromSessionH,
-                                          coap_packet_t * message,
-                                          coap_packet_t * response)
+uint8_t registration_handleRequest(lwm2m_context_t * contextP,
+                                   lwm2m_uri_t * uriP,
+                                   void * fromSessionH,
+                                   coap_packet_t * message,
+                                   coap_packet_t * response)
 {
-    coap_status_t result;
+    uint8_t result;
     time_t tv_sec;
 
     LOG_URI(uriP);
diff --git a/tests/block1tests.c b/tests/block1tests.c
index 46ce446cc..340a5a8ba 100644
--- a/tests/block1tests.c
+++ b/tests/block1tests.c
@@ -27,7 +27,7 @@ static void handle_12345(lwm2m_block1_data_t ** blk1,
     size_t bsize;
     uint8_t *resultBuffer = NULL;
 
-    coap_status_t st = coap_block1_handler(blk1, mid, buffer, 5, 5, 0, true, &resultBuffer, &bsize);
+    uint8_t st = coap_block1_handler(blk1, mid, buffer, 5, 5, 0, true, &resultBuffer, &bsize);
     CU_ASSERT_EQUAL(st, COAP_231_CONTINUE);
     CU_ASSERT_PTR_NULL(resultBuffer);
 }
@@ -38,7 +38,7 @@ static void handle_67(lwm2m_block1_data_t ** blk1,
     size_t bsize;
     uint8_t *resultBuffer = NULL;
 
-    coap_status_t st = coap_block1_handler(blk1, mid, buffer, 2, 5, 1, false, &resultBuffer, &bsize);
+    uint8_t st = coap_block1_handler(blk1, mid, buffer, 2, 5, 1, false, &resultBuffer, &bsize);
     CU_ASSERT_EQUAL(st, NO_ERROR);
     CU_ASSERT_PTR_NOT_NULL(*resultBuffer);
     CU_ASSERT_EQUAL(bsize, 7);