diff --git a/src/xrt/auxiliary/util/u_generic_callbacks.hpp b/src/xrt/auxiliary/util/u_generic_callbacks.hpp
index f3d6c13f7..99712788a 100644
--- a/src/xrt/auxiliary/util/u_generic_callbacks.hpp
+++ b/src/xrt/auxiliary/util/u_generic_callbacks.hpp
@@ -7,6 +7,8 @@
  * @ingroup aux_util
  */
 
+#pragma once
+
 #include <vector>
 #include <algorithm>
 
diff --git a/src/xrt/auxiliary/util/u_json.c b/src/xrt/auxiliary/util/u_json.c
index 7b3d48240..cb831f07a 100644
--- a/src/xrt/auxiliary/util/u_json.c
+++ b/src/xrt/auxiliary/util/u_json.c
@@ -80,7 +80,7 @@ u_json_get_bool(const cJSON *json, bool *out_bool)
 		return false;
 	}
 
-	*out_bool = json->valueint;
+	*out_bool = cJSON_IsTrue(json);
 
 	return true;
 }
diff --git a/src/xrt/drivers/realsense/rs_prober.c b/src/xrt/drivers/realsense/rs_prober.c
index 11a973cf9..9c7c94f91 100644
--- a/src/xrt/drivers/realsense/rs_prober.c
+++ b/src/xrt/drivers/realsense/rs_prober.c
@@ -78,6 +78,8 @@ rs_prober_destroy(struct xrt_auto_prober *p)
 /*!
  * @brief Explores a realsense device to see what SLAM capabilities it supports
  *
+ * @param device_list List in which the device resides.
+ * @param dev_idx Index of the device in @p device_list.
  * @param[out] out_hslam Whether it supports host-SLAM tracking (Has camera-imu streams)
  * @param[out] out_dslam Whether it supports device-SLAM tracking (T26x)
  */
diff --git a/src/xrt/ipc/server/ipc_server.h b/src/xrt/ipc/server/ipc_server.h
index f5296533a..9a1b21f25 100644
--- a/src/xrt/ipc/server/ipc_server.h
+++ b/src/xrt/ipc/server/ipc_server.h
@@ -375,7 +375,7 @@ void *
 ipc_server_client_thread(void *_cs);
 
 /*!
- * This destroyes the native compositor for this client and any extra objects
+ * This destroys the native compositor for this client and any extra objects
  * created from it, like all of the swapchains.
  */
 void
diff --git a/src/xrt/state_trackers/prober/p_tracking.c b/src/xrt/state_trackers/prober/p_tracking.c
index 0a93a7202..bed819a66 100644
--- a/src/xrt/state_trackers/prober/p_tracking.c
+++ b/src/xrt/state_trackers/prober/p_tracking.c
@@ -243,7 +243,7 @@ p_factory_ensure_frameserver(struct p_factory *fact)
 //! @todo Similar to p_factory_ensure_frameserver but for SLAM sources.
 //! Therefore we can only have one SLAM tracker at a time, with exactly one SLAM
 //! tracked device. It would be good to solve these artificial restrictions.
-static bool
+XRT_MAYBE_UNUSED static bool
 p_factory_ensure_slam_frameserver(struct p_factory *fact)
 {
 	//! @todo The check for (XRT_HAVE_SLAM && XRT_BUILD_DRIVER_* &&