diff --git a/src/iec61850/client/client_control.c b/src/iec61850/client/client_control.c
index 8d73f684..12b5669f 100644
--- a/src/iec61850/client/client_control.c
+++ b/src/iec61850/client/client_control.c
@@ -73,7 +73,7 @@ struct sControlObjectClient
 static void
 convertToMmsAndInsertFC(char* newItemId, const char* originalObjectName, const char* fc)
 {
-    int originalLength = strlen(originalObjectName);
+    int originalLength = (int) strlen(originalObjectName);
 
     int srcIndex = 0;
     int dstIndex = 0;
@@ -106,7 +106,7 @@ convertToMmsAndInsertFC(char* newItemId, const char* originalObjectName, const c
 static void
 resetLastApplError(ControlObjectClient self)
 {
-    self->lastApplError.error = 0;
+    self->lastApplError.error = CONTROL_ERROR_NO_ERROR;
     self->lastApplError.addCause = ADD_CAUSE_UNKNOWN;
     self->lastApplError.ctlNum = 0;
 }
diff --git a/src/iec61850/client/ied_connection.c b/src/iec61850/client/ied_connection.c
index 817d60b1..7c01cf8f 100644
--- a/src/iec61850/client/ied_connection.c
+++ b/src/iec61850/client/ied_connection.c
@@ -472,7 +472,7 @@ handleLastApplErrorMessage(IedConnection self, MmsValue* lastApplError)
 
     self->lastApplError.ctlNum = MmsValue_toUint32(ctlNum);
     self->lastApplError.addCause = (ControlAddCause) MmsValue_toInt32(addCause);
-    self->lastApplError.error = MmsValue_toInt32(error);
+    self->lastApplError.error = (ControlLastApplError) MmsValue_toInt32(error);
     LinkedList control = LinkedList_getNext(self->clientControls);
     while (control != NULL) {
         ControlObjectClient object = (ControlObjectClient) control->data;