diff --git a/Autocoders/Python/src/fprime_ac/generators/templates/component/hpp.tmpl b/Autocoders/Python/src/fprime_ac/generators/templates/component/hpp.tmpl
index 9c6ffba64f..4a9d7649b7 100644
--- a/Autocoders/Python/src/fprime_ac/generators/templates/component/hpp.tmpl
+++ b/Autocoders/Python/src/fprime_ac/generators/templates/component/hpp.tmpl
@@ -13,7 +13,14 @@
 \#include <FpConfig.hpp>
 \#include <Fw/Port/InputSerializePort.hpp>
 \#include <Fw/Port/OutputSerializePort.hpp>
+
+#if $kind == "passive":
+\#include <Fw/Comp/PassiveComponentBase.hpp>
+#else:
 \#include <Fw/Comp/ActiveComponentBase.hpp>
+#end if
+
+
 #if $has_guarded_ports or $has_parameters
 \#include <Os/Mutex.hpp>
 #end if
diff --git a/Fw/Types/CAssert.h b/Fw/Types/CAssert.h
index 857e3ffa69..0b60953c0c 100644
--- a/Fw/Types/CAssert.h
+++ b/Fw/Types/CAssert.h
@@ -20,7 +20,7 @@
 #define FILE_NAME_ARG NATIVE_UINT_TYPE
 #define FW_CASSERT(cond) ((void)((cond) ? (0) : (CAssert0(ASSERT_FILE_ID, __LINE__))))
 #else
-#define FILE_NAME_ARG const U8*
+#define FILE_NAME_ARG const CHAR*
 #define FW_CASSERT(cond) ((void)((cond) ? (0) : (CAssert0((FILE_NAME_ARG)(__FILE__), __LINE__))))
 #endif
 
diff --git a/Svc/FatalHandler/FatalHandlerComponentLinuxImpl.cpp b/Svc/FatalHandler/FatalHandlerComponentLinuxImpl.cpp
index 2805682255..ff72572eba 100644
--- a/Svc/FatalHandler/FatalHandlerComponentLinuxImpl.cpp
+++ b/Svc/FatalHandler/FatalHandlerComponentLinuxImpl.cpp
@@ -14,6 +14,7 @@
 #include <csignal>
 #include <Fw/Logger/Logger.hpp>
 #include <Svc/FatalHandler/FatalHandlerComponentImpl.hpp>
+#include <Os/Task.hpp>
 #include <FpConfig.hpp>
 
 namespace Svc {