diff --git a/camera/camera_manager.cc b/camera/camera_manager.cc
index ec9da2d..a229826 100644
--- a/camera/camera_manager.cc
+++ b/camera/camera_manager.cc
@@ -15,7 +15,7 @@ std::string config_search_location() {
 std::optional<YAML::Node> read_YAML(const std::string& filepath) {
   try {
     return YAML::LoadFile(filepath);
-  } catch (YAML::BadFile e) {
+  } catch (YAML::BadFile &e) {
     const std::string err = std::string("Could not find YAML file ") + filepath;
     throw std::runtime_error(err);
   }
@@ -94,4 +94,4 @@ Camera CameraManager::get_camera(const std::string& serial_number) const {
   }
   return camera_from_serial_.at(serial_number);
 }
-}  // namespace jet
\ No newline at end of file
+}  // namespace jet
diff --git a/embedded/servo_driver/servo_driver.cc b/embedded/servo_driver/servo_driver.cc
index b7557b6..1c9371e 100644
--- a/embedded/servo_driver/servo_driver.cc
+++ b/embedded/servo_driver/servo_driver.cc
@@ -37,7 +37,7 @@ ServoDriver::ServoDriver(const Config& config) {
     calibrated_max_ = config["calibrated_max"].as<float>();
     servo_index_ = config["index"].as<int>();
     assert(servo_index_ >= 0);
-  } catch (YAML::BadFile e) {
+  } catch (YAML::BadFile &e) {
     std::string err = std::string("Could not find YAML file ");
     throw std::runtime_error(err);
   }
diff --git a/embedded/servo_testing/manual_servo_input_bq.hh b/embedded/servo_testing/manual_servo_input_bq.hh
index 57bd1f5..802adef 100644
--- a/embedded/servo_testing/manual_servo_input_bq.hh
+++ b/embedded/servo_testing/manual_servo_input_bq.hh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <infrastructure/balsa_queue/balsa_queue.hh>
+#include "infrastructure/balsa_queue/balsa_queue.hh"
 #include "embedded/servo_bq/servo_balsaq.hh"
 #include "embedded/servo_bq/set_servo_message.hh"
 #include "embedded/servo_driver/servo_driver.hh"
diff --git a/infrastructure/balsa_queue/bq_main_macro.hh b/infrastructure/balsa_queue/bq_main_macro.hh
index 5fe1a63..0a9a75c 100644
--- a/infrastructure/balsa_queue/bq_main_macro.hh
+++ b/infrastructure/balsa_queue/bq_main_macro.hh
@@ -23,7 +23,7 @@ void signal_handler(int s) {
     if (argc > 1) {                                                           \
       try {                                                                   \
         config = YAML::LoadFile(argv[1]);                                     \
-      } catch (YAML::BadFile e) {                                             \
+      } catch (YAML::BadFile &e) {                                             \
         std::cerr << "Could not find YAML file " << std::endl;                \
         config = YAML::Node();                                                \
       }                                                                       \
diff --git a/infrastructure/comms/subscriber.hh b/infrastructure/comms/subscriber.hh
index f59abb2..104785d 100644
--- a/infrastructure/comms/subscriber.hh
+++ b/infrastructure/comms/subscriber.hh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <infrastructure/time/duration.hh>
+#include "infrastructure/time/duration.hh"
 #include "infrastructure/comms/schemas/message.hh"
 
 #include <memory>
diff --git a/infrastructure/comms/tests/pub_sub_demo_bqs/publisher_demo_bq.hh b/infrastructure/comms/tests/pub_sub_demo_bqs/publisher_demo_bq.hh
index 2e0489d..d623419 100644
--- a/infrastructure/comms/tests/pub_sub_demo_bqs/publisher_demo_bq.hh
+++ b/infrastructure/comms/tests/pub_sub_demo_bqs/publisher_demo_bq.hh
@@ -1,4 +1,4 @@
-#include <infrastructure/balsa_queue/balsa_queue.hh>
+#include "infrastructure/balsa_queue/balsa_queue.hh"
 
 namespace jet {
 
diff --git a/infrastructure/comms/tests/pub_sub_demo_bqs/subscriber_demo_bq.hh b/infrastructure/comms/tests/pub_sub_demo_bqs/subscriber_demo_bq.hh
index 44d6b4b..827f7e3 100644
--- a/infrastructure/comms/tests/pub_sub_demo_bqs/subscriber_demo_bq.hh
+++ b/infrastructure/comms/tests/pub_sub_demo_bqs/subscriber_demo_bq.hh
@@ -1,4 +1,4 @@
-#include <infrastructure/balsa_queue/balsa_queue.hh>
+#include "infrastructure/balsa_queue/balsa_queue.hh"
 
 namespace jet {
 
diff --git a/infrastructure/engine/turbine_interface_bq.hh b/infrastructure/engine/turbine_interface_bq.hh
index 008cdf7..0462fb2 100644
--- a/infrastructure/engine/turbine_interface_bq.hh
+++ b/infrastructure/engine/turbine_interface_bq.hh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <infrastructure/balsa_queue/balsa_queue.hh>
+#include "infrastructure/balsa_queue/balsa_queue.hh"
 
 #include "infrastructure/engine/jetcat_turbine.hh"
 #include "infrastructure/gonogo/gonogo_message.hh"
diff --git a/infrastructure/engine/turbine_monitor_utility.hh b/infrastructure/engine/turbine_monitor_utility.hh
index 4b45b31..8fc77c3 100644
--- a/infrastructure/engine/turbine_monitor_utility.hh
+++ b/infrastructure/engine/turbine_monitor_utility.hh
@@ -1,4 +1,4 @@
-#include <infrastructure/balsa_queue/balsa_queue.hh>
+#include "infrastructure/balsa_queue/balsa_queue.hh"
 
 namespace jet {
 
diff --git a/infrastructure/time/timesync_bq/timesync_master_bq.hh b/infrastructure/time/timesync_bq/timesync_master_bq.hh
index 329fe97..f8d19ff 100644
--- a/infrastructure/time/timesync_bq/timesync_master_bq.hh
+++ b/infrastructure/time/timesync_bq/timesync_master_bq.hh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <infrastructure/balsa_queue/balsa_queue.hh>
+#include "infrastructure/balsa_queue/balsa_queue.hh"
 
 namespace jet {
 
diff --git a/vision/fiducial_detection_balsaq.hh b/vision/fiducial_detection_balsaq.hh
index 0e45f33..e54542f 100644
--- a/vision/fiducial_detection_balsaq.hh
+++ b/vision/fiducial_detection_balsaq.hh
@@ -1,4 +1,4 @@
-#include <infrastructure/balsa_queue/balsa_queue.hh>
+#include "infrastructure/balsa_queue/balsa_queue.hh"
 //%deps(opencv)
 #include <opencv2/aruco.hpp>
 #include <opencv2/opencv.hpp>