diff --git a/src/iec61850/client/client_goose_control.c b/src/iec61850/client/client_goose_control.c
index d079dacb..58bbb0e6 100644
--- a/src/iec61850/client/client_goose_control.c
+++ b/src/iec61850/client/client_goose_control.c
@@ -983,6 +983,9 @@ IedConnection_setGoCBValuesAsync(IedConnection self, IedClientError* error, Clie
     char domainId[65];
     char itemId[130];
 
+    LinkedList itemIds = NULL;
+    LinkedList values = NULL;
+
     if (MmsMapping_getMmsDomainFromObjectReference(goCB->objectReference, domainId) == NULL)
     {
         *error = IED_ERROR_OBJECT_REFERENCE_INVALID;
@@ -1017,8 +1020,8 @@ IedConnection_setGoCBValuesAsync(IedConnection self, IedClientError* error, Clie
     int itemIdLen = strlen(itemId);
 
     /* create the list of requested itemIds references */
-    LinkedList itemIds = LinkedList_create();
-    LinkedList values = LinkedList_create();
+    itemIds = LinkedList_create();
+    values = LinkedList_create();
 
     /* add rGoEna as last element */
     if (parametersMask & GOCB_ELEMENT_GO_ID)
diff --git a/src/iec61850/server/model/config_file_parser.c b/src/iec61850/server/model/config_file_parser.c
index feb73529..53d8c1fc 100644
--- a/src/iec61850/server/model/config_file_parser.c
+++ b/src/iec61850/server/model/config_file_parser.c
@@ -228,6 +228,10 @@ exit_error:
 IedModel*
 ConfigFileParser_createModelFromConfigFile(FileHandle fileHandle)
 {
+    IedModel* model = NULL;
+    int indendation = 0;
+    int currentLine = 0;
+
     uint8_t* lineBuffer = (uint8_t*)GLOBAL_MALLOC(READ_BUFFER_MAX_SIZE);
 
     if (lineBuffer == NULL)
@@ -236,11 +240,9 @@ ConfigFileParser_createModelFromConfigFile(FileHandle fileHandle)
     int bytesRead = 1;
 
     bool stateInModel = false;
-    int indendation = 0;
     bool inArray = false;
     bool inArrayElement = false;
 
-    IedModel* model = NULL;
     LogicalDevice* currentLD = NULL;
     LogicalNode* currentLN = NULL;
     ModelNode* currentModelNode = NULL;
@@ -253,7 +255,6 @@ ConfigFileParser_createModelFromConfigFile(FileHandle fileHandle)
     char nameString2[130];
     char nameString3[130];
 
-    int currentLine = 0;
 
     while (bytesRead > 0)
     {