diff --git a/dummies/helperFactory.h b/dummies/helperFactory.h
index 467cb172..bab9d8d8 100644
--- a/dummies/helperFactory.h
+++ b/dummies/helperFactory.h
@@ -19,7 +19,7 @@ struct DummyCfg {
   bool addTempSensorDummies = true;
   bool addRtdComIFDummy = true;
   bool addPlocDummies = true;
-  bool addCamSwitcherDummy = true;
+  bool addCamSwitcherDummy = false;
 };
 
 void createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitch, GpioIF* gpioIF, bool enableHkSets);
diff --git a/mission/cfdp/CfdpHandler.cpp b/mission/cfdp/CfdpHandler.cpp
index 902097b6..baf501e4 100644
--- a/mission/cfdp/CfdpHandler.cpp
+++ b/mission/cfdp/CfdpHandler.cpp
@@ -93,6 +93,7 @@ ReturnValue_t CfdpHandler::handleCfdpPacket(TmTcMessage& msg) {
       return INVALID_PDU_FORMAT;
     }
     if (not FileDirectiveReader::checkFileDirective(pduDataField[0])) {
+      sif::error << "CfdpHandler: Invalid PDU directive field " << pduDataField[0] << std::endl;
       return INVALID_DIRECTIVE_FIELD;
     }
     auto directive = static_cast<FileDirective>(pduDataField[0]);