diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/robotCommand b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/robotCommand
index 85b3b5689a..06757bd83d 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/robotCommand
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/robotCommand
@@ -1 +1 @@
-/home/lvuser/FRCUserProgram
+/usr/local/frc/bin/netconsole-host /home/lvuser/FRCUserProgram
diff --git a/hal/lib/Athena/HAL.cpp b/hal/lib/Athena/HAL.cpp
index 8512c1ae86..7b47745358 100644
--- a/hal/lib/Athena/HAL.cpp
+++ b/hal/lib/Athena/HAL.cpp
@@ -11,6 +11,7 @@
 #include <fstream>
 #include <iostream>
 #include <unistd.h>
+#include <sys/prctl.h>
 #include <signal.h> // linux for kill
 const uint32_t solenoid_kNumDO7_0Elements = 8;
 const uint32_t dio_kNumSystems = tDIO::kNumSystems;
@@ -214,6 +215,11 @@ void HALSetNewDataSem(pthread_mutex_t * param)
  */
 int HALInitialize(int mode)
 {
+    setlinebuf(stdin);
+    setlinebuf(stdout);
+
+    prctl(PR_SET_PDEATHSIG, SIGTERM);
+
 	FRC_NetworkCommunication_Reserve(nullptr);
 	// image 4; Fixes errors caused by multiple processes. Talk to NI about this
 	nFPGA::nRoboRIO_FPGANamespace::g_currentTargetClass =