diff --git a/devicehandlers/DeviceHandlerBase.h b/devicehandlers/DeviceHandlerBase.h
index 8f1b135b..eda318cb 100644
--- a/devicehandlers/DeviceHandlerBase.h
+++ b/devicehandlers/DeviceHandlerBase.h
@@ -106,13 +106,15 @@ public:
 	void setThermalStateRequestPoolIds(uint32_t thermalStatePoolId,
 			uint32_t thermalRequestPoolId);
 	/**
-	 * @brief   Helper function to easy device handler development.
+	 * @brief   Helper function to ease device handler development.
 	 * This will instruct the transition to MODE_ON immediately
 	 * (leading to doStartUp() being called for the transition to the ON mode),
 	 * so external mode commanding is not necessary anymore.
 	 *
 	 * This has to be called before the task is started!
-	 * (e.g. in the task factory)
+	 * (e.g. in the task factory). This is only a helper function for
+	 * development. Regular mode commanding should be performed by commanding
+	 * the AssemblyBase or Subsystem objects resposible for the device handler.
 	 */
 	void setStartUpImmediately();
 
diff --git a/internalError/InternalErrorDataset.h b/internalError/InternalErrorDataset.h
index 6bba1171..52a4b632 100644
--- a/internalError/InternalErrorDataset.h
+++ b/internalError/InternalErrorDataset.h
@@ -18,8 +18,8 @@ public:
     InternalErrorDataset(HasLocalDataPoolIF* owner):
             StaticLocalDataSet(owner, ERROR_SET_ID) {}
 
-    InternalErrorDataset(sid_t sid):
-           StaticLocalDataSet(sid) {}
+    InternalErrorDataset(object_id_t objectId):
+           StaticLocalDataSet(sid_t(objectId , ERROR_SET_ID)) {}
 
     lp_var_t<uint32_t> tmHits = lp_var_t<uint32_t>(TM_HITS,
             hkManager->getOwner(), this);
diff --git a/osal/FreeRTOS/PeriodicTask.cpp b/osal/FreeRTOS/PeriodicTask.cpp
index 990d38d6..c90587bd 100644
--- a/osal/FreeRTOS/PeriodicTask.cpp
+++ b/osal/FreeRTOS/PeriodicTask.cpp
@@ -133,11 +133,11 @@ TaskHandle_t PeriodicTask::getTaskHandle() {
 }
 
 void PeriodicTask::handleMissedDeadline() {
-#ifdef DEBUG
-    sif::warning << "PeriodicTask: " << pcTaskGetName(NULL) <<
-            " missed deadline!\n" << std::flush;
-#endif
     if(deadlineMissedFunc != nullptr) {
         this->deadlineMissedFunc();
     }
+#ifdef DEBUG
+    sif::warning << "PeriodicTask::handleMissedDeadline " << pcTaskGetName(NULL)
+    		<< " missed deadline!\n" << std::flush;
+#endif
 }