diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 00000000..96f5703c
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,7 @@
+## Changes from ASTP 0.0.1 to 0.0.2
+
+
+### FreeRTOS OSAL
+
+- vRequestContextSwitchFromISR is declared extern "C" so it can be defined in
+a C file without issues
diff --git a/devicehandlers/DeviceHandlerIF.h b/devicehandlers/DeviceHandlerIF.h
index 52a3be4d..10907a89 100644
--- a/devicehandlers/DeviceHandlerIF.h
+++ b/devicehandlers/DeviceHandlerIF.h
@@ -18,6 +18,8 @@ public:
 	static const uint8_t TRANSITION_MODE_CHILD_ACTION_MASK = 0x20;
 	static const uint8_t TRANSITION_MODE_BASE_ACTION_MASK = 0x10;
 
+	static constexpr Command_t NO_COMMAND = 0xffffffff;
+
 	/**
 	 * @brief This is the mode the <strong>device handler</strong> is in.
 	 *
diff --git a/fsfw.mk b/fsfw.mk
index 3639717b..f2cdd7ab 100644
--- a/fsfw.mk
+++ b/fsfw.mk
@@ -70,3 +70,5 @@ CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/packetmatcher/*.cpp)
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/pus/*.cpp)
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcservices/*.cpp)
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/pus/*.cpp)
+
+INCLUDES += $(CURRENTPATH)