diff --git a/src/evcsnm.c b/src/evcsnm.c
index 179c660..cf0f05b 100644
--- a/src/evcsnm.c
+++ b/src/evcsnm.c
@@ -25,8 +25,7 @@ static UTF8String_t *create_empty_utf8_string()
 {
     UTF8String_t *utf8_string = calloc(1, sizeof(UTF8String_t));
     utf8_string->buf = calloc(1, 1);
-    utf8_string->size = 0;
-    utf8_string->buf[0] = '\0';
+    utf8_string->size = 1;
     return utf8_string;
 }
 
@@ -51,7 +50,7 @@ static int mk_evcsnm(uint8_t *evcsnm_oer, uint32_t *evcsnm_len)
     evcsnm->evcsn.evcsnData.totalNumberOfStations = 1;
     evcsnm->evcsn.evcsnData.chargingStationsData.list.array = calloc(1, sizeof(void *));
     evcsnm->evcsn.evcsnData.chargingStationsData.list.count = 1;
-    evcsnm->evcsn.evcsnData.chargingStationsData.list.size = 1;
+    evcsnm->evcsn.evcsnData.chargingStationsData.list.size = sizeof(void *) * 1;
     evcsnm->evcsn.evcsnData.chargingStationsData.list.array[0] = calloc(1, sizeof(struct ItsChargingStationData));
     struct ItsChargingStationData *cs0 = evcsnm->evcsn.evcsnData.chargingStationsData.list.array[0];
     cs0->chargingStationID = 0;
@@ -63,24 +62,23 @@ static int mk_evcsnm(uint8_t *evcsnm_oer, uint32_t *evcsnm_len)
     cs0->chargingStationLocation.altitude.altitudeConfidence = epv.space.altitude_conf;
     cs0->chargingStationLocation.positionConfidenceEllipse.semiMajorConfidence = SemiAxisLength_unavailable;
     cs0->chargingStationLocation.positionConfidenceEllipse.semiMinorConfidence = SemiAxisLength_unavailable;
-    cs0->chargingStationLocation.positionConfidenceEllipse.semiMajorOrientation = SemiAxisLength_unavailable;
+    cs0->chargingStationLocation.positionConfidenceEllipse.semiMajorOrientation = HeadingValue_unavailable;
     cs0->accessibility = *create_empty_utf8_string();
     cs0->pricing = *create_empty_utf8_string();
     cs0->openingDaysHours = *create_empty_utf8_string();
     cs0->chargingSpotsAvailable.list.array = calloc(1, sizeof(void *));
     cs0->chargingSpotsAvailable.list.count = 1;
-    cs0->chargingSpotsAvailable.list.size = 1;
+    cs0->chargingSpotsAvailable.list.size = sizeof(void *) * 1;
     cs0->chargingSpotsAvailable.list.array[0] = calloc(1, sizeof(struct ItsChargingSpotDataElements));
     struct ItsChargingSpotDataElements *cs_elem0 = cs0->chargingSpotsAvailable.list.array[0];
     cs_elem0->energyAvailability = *create_empty_utf8_string();
     cs_elem0->type.buf = calloc(1, sizeof(uint8_t));
     cs_elem0->type.size = 1;
-    cs_elem0->type.bits_unused = 24;
+    cs_elem0->type.bits_unused = 0;
     cs_elem0->type.buf[0] = 0;
     cs_elem0->typeOfReceptacle.buf = calloc(1, sizeof(uint8_t));
     cs_elem0->typeOfReceptacle.size = 1;
-    cs_elem0->typeOfReceptacle.bits_unused = 24;
-
+    cs_elem0->typeOfReceptacle.bits_unused = 0;
     itss_space_unlock(epv);
     // if (facilities.station_type == StationType_roadSideUnit)
     //{
@@ -100,7 +98,8 @@ cleanup:
     return rv;
 }
 
-int evcsnm_check(EvcsnPdu_t* evcsnm) {
+int evcsnm_check(EvcsnPdu_t *evcsnm)
+{
     return 0;
 }