diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte
index de2ee9d..75ee724 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte
@@ -10,7 +10,7 @@
     }
     CSV_LOAD = {
       PVName = (@rfid .. "-GAF:STAT-CSV-LOAD")
-      Type = uint32
+      Type = int32
     }
     CSV_NAME = {
       PVName = (@rfid .. "-GAF:STAT-CSV-NAME")
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/pxi.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/pxi.marte
index 36aa84b..fffe14c 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/pxi.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/pxi.marte
@@ -410,7 +410,7 @@
 //# NI6259.0
 //# APS_SWON BoardId=0, PortId=3.0
 +NI6259_DIO_P0 = {
-  Class = NI6259DIO
+  Class = "NI6259::NI6259DIO"
   DeviceName = "/dev/pxi6259"
   BoardId = 1
   Signals = {
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/preprogrammed_waveform.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/preprogrammed_waveform.marte
index 4037eb5..55bee1e 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/preprogrammed_waveform.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/preprogrammed_waveform.marte
@@ -7,7 +7,7 @@
   InputSignals = {
     CSV_LOAD = {
       DataSource = EPICSCAInput
-      Type = uint32
+      Type = int32
     }
     Filename = {
       Alias = CSV_NAME
@@ -45,7 +45,7 @@
   InputSignals = {
     CSV_LOAD = {
       DataSource = EPICSCAInput
-      Type = uint32
+      Type = int32
     }
     Filename = {
       Alias = CSV_NAME
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/state_management.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/state_management.marte
index c419302..58056e9 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/state_management.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/state_management.marte
@@ -244,6 +244,7 @@
     InputSignals = {
       PLC_CC_OP_SELECTED = {
         DataSource = DDB1
+        Type = uint8
         Comparator = "EQUALS"
         Value = 1
       }
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/ccps.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/ccps.marte
index 3fa41c2..e431991 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/ccps.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread6/ccps.marte
@@ -33,7 +33,7 @@
 
 +Data = {
   +DDB6 = {
-    AllowNoProducer = 1
+    AllowNoProducers = 1
     Signals = {
       CCPS_REF = {
         Type = float32