diff --git a/src/libraries/JANA/Engine/JExecutionEngine.cc b/src/libraries/JANA/Engine/JExecutionEngine.cc
index 7ad624eb4..08e13fa0f 100644
--- a/src/libraries/JANA/Engine/JExecutionEngine.cc
+++ b/src/libraries/JANA/Engine/JExecutionEngine.cc
@@ -788,6 +788,7 @@ std::string ToString(JExecutionEngine::RunStatus runstatus) {
         case JExecutionEngine::RunStatus::Pausing: return "Pausing";
         case JExecutionEngine::RunStatus::Draining: return "Draining";
         case JExecutionEngine::RunStatus::Finished: return "Finished";
+        default: return "CorruptedRunStatus";
     }
 }
 
diff --git a/src/programs/unit_tests/Components/BarrierEventTests.cc b/src/programs/unit_tests/Components/BarrierEventTests.cc
index 4a2ce5ce7..37e62580c 100644
--- a/src/programs/unit_tests/Components/BarrierEventTests.cc
+++ b/src/programs/unit_tests/Components/BarrierEventTests.cc
@@ -8,7 +8,7 @@
 #include "JANA/Utils/JBenchUtils.h"
 #include "catch.hpp"
 
-int global_resource = 0;
+size_t global_resource = 0;
 
 
 struct BarrierSource : public JEventSource {