diff --git a/Firmware/Tupfile.lua b/Firmware/Tupfile.lua
index 35725d80..b67ad651 100644
--- a/Firmware/Tupfile.lua
+++ b/Firmware/Tupfile.lua
@@ -7,9 +7,9 @@ tup.include('build.lua')
 -- On some systems this may return a python2 command if Python3 is not installed.
 function find_python3()
     success, python_version = run_now("python --version")
-    if success and string.match(python_version, "Python 3") then return "python" end
+    if success and string.match(python_version, "Python 3") then return "python -B" end
     success, python_version = run_now("python3 --version")
-    if success and string.match(python_version, "Python 3") then return "python3" end
+    if success and string.match(python_version, "Python 3") then return "python3 -B" end
     error("Python 3 not found.")
 end
 
diff --git a/Firmware/fibre/cpp/include/fibre/cpp_utils.hpp b/Firmware/fibre/cpp/include/fibre/cpp_utils.hpp
index 6a81858d..b09aa400 100644
--- a/Firmware/fibre/cpp/include/fibre/cpp_utils.hpp
+++ b/Firmware/fibre/cpp/include/fibre/cpp_utils.hpp
@@ -82,6 +82,7 @@ public:
 #include <tuple>
 #include <functional>
 #include <unordered_map>
+#include <ostream>
 
 /* Backport features from C++14 and C++17 ------------------------------------*/