diff --git a/src/xrt/compositor/main/comp_renderer.c b/src/xrt/compositor/main/comp_renderer.c
index 161c61f02..16f1748df 100644
--- a/src/xrt/compositor/main/comp_renderer.c
+++ b/src/xrt/compositor/main/comp_renderer.c
@@ -1126,7 +1126,7 @@ comp_renderer_draw(struct comp_renderer *r)
 	const uint32_t view_count = c->nr.view_count;
 	enum comp_target_fov_source fov_source = COMP_TARGET_FOV_SOURCE_DISTORTION;
 
-	// For sratch image debugging.
+	// For scratch image debugging.
 	struct comp_render_scratch_state crss;
 	scratch_get_init(&crss, r, view_count);
 
diff --git a/src/xrt/compositor/main/comp_target_swapchain.c b/src/xrt/compositor/main/comp_target_swapchain.c
index 24ab25d32..70778a3a2 100644
--- a/src/xrt/compositor/main/comp_target_swapchain.c
+++ b/src/xrt/compositor/main/comp_target_swapchain.c
@@ -130,7 +130,7 @@ select_extent(struct comp_target_swapchain *cts, VkSurfaceCapabilitiesKHR caps,
 	/*
 	 * A sub-class wants us to use these extents over the ones the
 	 * compositor preferred, this is probably due to the target only
-	 * upporting this size so we better respect those wishes.
+	 * supporting this size so we better respect those wishes.
 	 */
 	if (cts->override.compositor_extent) {
 		preferred.width = cts->override.extent.width;
diff --git a/src/xrt/compositor/render/render_util.c b/src/xrt/compositor/render/render_util.c
index f3c5a30ae..58dc65b71 100644
--- a/src/xrt/compositor/render/render_util.c
+++ b/src/xrt/compositor/render/render_util.c
@@ -108,7 +108,7 @@ render_calc_time_warp_matrix(const struct xrt_pose *src_pose,
 	m_mat4_f64_orientation(&new_q, &new_rot_inv); // This is a model matrix, a inverted view matrix.
 	m_mat4_f64_invert(&new_rot_inv, &new_rot);    // Invert to make it a view matrix.
 
-	// Combine both rotation matricies to get difference.
+	// Combine both rotation matrices to get difference.
 	struct xrt_matrix_4x4_f64 delta_rot, delta_rot_inv;
 	m_mat4_f64_multiply(&new_rot, &src_rot_inv, &delta_rot);
 	m_mat4_f64_invert(&delta_rot, &delta_rot_inv);
diff --git a/src/xrt/compositor/util/comp_render.h b/src/xrt/compositor/util/comp_render.h
index 2dbbf6011..653cc0e3d 100644
--- a/src/xrt/compositor/util/comp_render.h
+++ b/src/xrt/compositor/util/comp_render.h
@@ -327,12 +327,12 @@ comp_render_cs_layers(struct render_compute *crc,
  *
  * Expected layouts:
  * * Layer images: VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
- * * Sratch images: Any
+ * * Scratch images: Any
  * * Target image: Any
  *
  * After call layouts:
  * * Layer images: VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
- * * Sratch images: VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
+ * * Scratch images: VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
  * * Target image: VK_IMAGE_LAYOUT_PRESENT_SRC_KHR
  *
  * @ingroup comp_util
diff --git a/src/xrt/compositor/util/comp_swapchain.c b/src/xrt/compositor/util/comp_swapchain.c
index c6f4ae999..e2d7842dd 100644
--- a/src/xrt/compositor/util/comp_swapchain.c
+++ b/src/xrt/compositor/util/comp_swapchain.c
@@ -477,7 +477,7 @@ error:
 static void
 really_destroy(struct comp_swapchain *sc)
 {
-	// Re-use close function.
+	// Reuse close function.
 	comp_swapchain_teardown(sc);
 
 	free(sc);