diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef714d1fd1a7c76fa468ec692a6583a80bc53db6..ca3c642d62ca1e8d1eec61e82d0e4460198a7332 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
 
 set(${PROJECT_NAME}_MAJOR_VERSION 08)
 set(${PROJECT_NAME}_MINOR_VERSION 08)
-set(${PROJECT_NAME}_PATCH_VERSION 00)
+set(${PROJECT_NAME}_PATCH_VERSION 01)
 include(cmake/set_version_numbers.cmake)
 
 include(cmake/set_default_flags.cmake)
diff --git a/include/AdcBoard.h b/include/AdcBoard.h
index 6cd23bf7e6e02b8511371c06cd6e919fba26ba76..af19e7259246250501e8600e663252a1b074d064 100644
--- a/include/AdcBoard.h
+++ b/include/AdcBoard.h
@@ -11,7 +11,6 @@
 #include <LLRFLibrary/RotationParameter.h>
 
 #include <ChimeraTK/ApplicationCore/ApplicationCore.h>
-#include <ChimeraTK/ApplicationCore/BitMask.h>
 #include <ChimeraTK/ApplicationCore/LimitValue.h>
 #include <ChimeraTK/ApplicationCore/Multiplier.h>
 #include <ChimeraTK/ApplicationCore/ScriptedInitialisationHandler.h>
diff --git a/include/Controller.h b/include/Controller.h
index 665ec62993e2d222119fa5bae6d8918d83d4516f..8c52f783615ecce626269d1dd7119f241d2e7fd7 100644
--- a/include/Controller.h
+++ b/include/Controller.h
@@ -15,7 +15,6 @@
 #include <LLRFLibrary/RotationParameter.h>
 
 #include <ChimeraTK/ApplicationCore/ApplicationCore.h>
-#include <ChimeraTK/ApplicationCore/BitMask.h>
 #include <ChimeraTK/ApplicationCore/LimitValue.h>
 #include <ChimeraTK/ApplicationCore/Multiplier.h>
 #include <ChimeraTK/ApplicationCore/Pipe.h>
diff --git a/include/DaqTriggerMux.h b/include/DaqTriggerMux.h
index 3b1f44a1d0c118eb075b2e52cea95abbb716b49c..90c884307213a61b1053014d283d278301d44350 100644
--- a/include/DaqTriggerMux.h
+++ b/include/DaqTriggerMux.h
@@ -36,7 +36,9 @@ class DaqTriggerMux : public ctk::ApplicationModule {
 
   // Output registers to configure DAQ MUX and decimation
   ctk::ScalarOutput<uint8_t> _daqMuxForRawMode{this, "WORD_DAQ_MUX1", "", "Secondary DAQ mode"};
-  ctk::ScalarOutput<uint8_t> _daqEnableForRawMode{
-      this, "daqEnableForRawMode", "", "1: Amplitude/Phase data, 2: RAW mode"};
+  ctk::ScalarOutput<ChimeraTK::Boolean> _daqEnableAmplPhase{
+      this, "daqEnableAmplPhase", "", "Enable amplitude/phase DAQ"};
+  ctk::ScalarOutput<ChimeraTK::Boolean> _daqEnableRaw{
+      this, "daqEnableRaw", "", "Enable RAW DAQ"};
   ctk::ScalarOutput<uint32_t> _timingDividerAdc{this, "timingDividerAdc", "", "Frequency divider used for ADC DAQ"};
 };
diff --git a/src/DaqTriggerMux.cc b/src/DaqTriggerMux.cc
index e015c581825c102aea2a77de292bb2ccf4b14b61..a0af431079e8e38f6e012ea8f8c930863a05ca3a 100644
--- a/src/DaqTriggerMux.cc
+++ b/src/DaqTriggerMux.cc
@@ -9,7 +9,8 @@ void DaqTriggerMux::mainLoop() {
   while(true) {
     if(_rawDaqMode == 0) {
       _daqMuxForRawMode.writeIfDifferent(1);
-      _daqEnableForRawMode.writeIfDifferent(1);
+      _daqEnableAmplPhase.writeIfDifferent(1);
+      _daqEnableRaw.writeIfDifferent(0);
       _timingDividerAdc.writeIfDifferent(_timingDividerController);
 
       // pass through trigger unconditionally, not only if trigger number has changed
@@ -18,7 +19,8 @@ void DaqTriggerMux::mainLoop() {
     }
     else {
       _daqMuxForRawMode.writeIfDifferent(2);
-      _daqEnableForRawMode.writeIfDifferent(2);
+      _daqEnableAmplPhase.writeIfDifferent(1);
+      _daqEnableRaw.writeIfDifferent(0);
       if(_timingDividerAdc != 0) {
         // Full ADC speed is usually too fast for the DDR RAM, hence we divide the strobe by nSinCosTableSize+1.
         // This will result in seeing a very similar signal as without divider, as the samples have the same