diff --git a/examples/server_example3/server_example3.c b/examples/server_example3/server_example3.c
index 7e7e7ee..b0681a0 100644
--- a/examples/server_example3/server_example3.c
+++ b/examples/server_example3/server_example3.c
@@ -26,9 +26,11 @@ sigint_handler(int signalId)
     running = 0;
 }
 
-bool
+static ControlHandlerResult
 controlHandlerForBinaryOutput(void* parameter, MmsValue* value, bool test)
 {
+    if (test)
+        return CONTROL_RESULT_FAILED;
 
     if (MmsValue_getType(value) == MMS_BOOLEAN) {
         printf("received binary control command: ");
@@ -39,7 +41,7 @@ controlHandlerForBinaryOutput(void* parameter, MmsValue* value, bool test)
             printf("off\n");
     }
     else
-        return false;
+        return CONTROL_RESULT_FAILED;
 
     uint64_t timeStamp = Hal_getTimeInMs();
 
@@ -63,7 +65,7 @@ controlHandlerForBinaryOutput(void* parameter, MmsValue* value, bool test)
         IedServer_updateAttributeValue(iedServer, IEDMODEL_GenericIO_GGIO1_SPCSO4_stVal, value);
     }
 
-    return true;
+    return CONTROL_RESULT_OK;
 }
 
 
diff --git a/src/goose/goose_receiver.c b/src/goose/goose_receiver.c
index 91a435c..44595d9 100644
--- a/src/goose/goose_receiver.c
+++ b/src/goose/goose_receiver.c
@@ -649,7 +649,7 @@ parseGooseMessage(GooseReceiver self, int numbytes)
 
     int apduLength = length - 8;
 
-    if (numbytes != length + headerLength) {
+    if (numbytes < length + headerLength) {
         if (DEBUG)
             printf("GOOSE_SUBSCRIBER: Invalid PDU size\n");
         return;
diff --git a/src/mms/iso_mms/server/mms_named_variable_list_service.c b/src/mms/iso_mms/server/mms_named_variable_list_service.c
index 41a91a7..dd4f495 100644
--- a/src/mms/iso_mms/server/mms_named_variable_list_service.c
+++ b/src/mms/iso_mms/server/mms_named_variable_list_service.c
@@ -173,7 +173,7 @@ mmsServer_handleDeleteNamedVariableListRequest(MmsServerConnection connection,
 				if (variableList != NULL) {
 					numberMatched++;
 
-					if (mmsServer_callVariableListChangedHandler(false, MMS_ASSOCIATION_SPECIFIC, NULL, listName, connection) == true) {
+					if (mmsServer_callVariableListChangedHandler(false, MMS_ASSOCIATION_SPECIFIC, NULL, listName, connection) == MMS_ERROR_NONE) {
 					    numberDeleted++;
 					    MmsServerConnection_deleteNamedVariableList(connection, listName);
 					}
@@ -470,7 +470,7 @@ mmsServer_handleDefineNamedVariableListRequest(
 
                 if (namedVariableList != NULL) {
 
-                    if (mmsServer_callVariableListChangedHandler(true, MMS_ASSOCIATION_SPECIFIC, NULL, variableListName, connection) == true) {
+                    if (mmsServer_callVariableListChangedHandler(true, MMS_ASSOCIATION_SPECIFIC, NULL, variableListName, connection) == MMS_ERROR_NONE) {
                         MmsServerConnection_addNamedVariableList(connection, namedVariableList);
                         createDefineNamedVariableListResponse(invokeId, response);
                     }