diff --git a/clients/cairo-util.c b/clients/cairo-util.c
index df2fb1bf..4257590a 100644
--- a/clients/cairo-util.c
+++ b/clients/cairo-util.c
@@ -169,7 +169,7 @@ tile_mask(cairo_t *cr, cairo_surface_t *surface,
 		cairo_mask(cr, pattern);
 	}
 
-	/* Top strecth */
+	/* Top stretch */
 	cairo_matrix_init_translate(&matrix, 64, 0);
 	cairo_matrix_scale(&matrix, 64.0 / (width - 2 * margin), 1);
 	cairo_matrix_translate(&matrix, -x - width / 2, -y);
@@ -184,7 +184,7 @@ tile_mask(cairo_t *cr, cairo_surface_t *surface,
 	cairo_clip (cr);
 	cairo_mask(cr, pattern);
 
-	/* Bottom strecth */
+	/* Bottom stretch */
 	cairo_matrix_translate(&matrix, 0, -height + 128);
 	cairo_pattern_set_matrix(pattern, &matrix);
 
@@ -194,7 +194,7 @@ tile_mask(cairo_t *cr, cairo_surface_t *surface,
 	cairo_clip (cr);
 	cairo_mask(cr, pattern);
 
-	/* Left strecth */
+	/* Left stretch */
 	cairo_matrix_init_translate(&matrix, 0, 64);
 	cairo_matrix_scale(&matrix, 1, 64.0 / (height - 2 * margin));
 	cairo_matrix_translate(&matrix, -x, -y - height / 2);
@@ -204,7 +204,7 @@ tile_mask(cairo_t *cr, cairo_surface_t *surface,
 	cairo_clip (cr);
 	cairo_mask(cr, pattern);
 
-	/* Right strecth */
+	/* Right stretch */
 	cairo_matrix_translate(&matrix, -width + 128, 0);
 	cairo_pattern_set_matrix(pattern, &matrix);
 	cairo_rectangle(cr, x + width - margin, y + margin,
@@ -251,7 +251,7 @@ tile_source(cairo_t *cr, cairo_surface_t *surface,
 		cairo_fill(cr);
 	}
 
-	/* Top strecth */
+	/* Top stretch */
 	cairo_matrix_init_translate(&matrix, 64, 0);
 	cairo_matrix_scale(&matrix, 64.0 / (width - 2 * margin), 1);
 	cairo_matrix_translate(&matrix, -x - width / 2, -y);
@@ -259,14 +259,14 @@ tile_source(cairo_t *cr, cairo_surface_t *surface,
 	cairo_rectangle(cr, x + margin, y, width - 2 * margin, top_margin);
 	cairo_fill(cr);
 
-	/* Bottom strecth */
+	/* Bottom stretch */
 	cairo_matrix_translate(&matrix, 0, -height + 128);
 	cairo_pattern_set_matrix(pattern, &matrix);
 	cairo_rectangle(cr, x + margin, y + height - margin,
 			width - 2 * margin, margin);
 	cairo_fill(cr);
 
-	/* Left strecth */
+	/* Left stretch */
 	cairo_matrix_init_translate(&matrix, 0, 64);
 	cairo_matrix_scale(&matrix, 1, 64.0 / (height - margin - top_margin));
 	cairo_matrix_translate(&matrix, -x, -y - height / 2);
@@ -275,7 +275,7 @@ tile_source(cairo_t *cr, cairo_surface_t *surface,
 			margin, height - margin - top_margin);
 	cairo_fill(cr);
 
-	/* Right strecth */
+	/* Right stretch */
 	cairo_matrix_translate(&matrix, -width + 128, 0);
 	cairo_pattern_set_matrix(pattern, &matrix);
 	cairo_rectangle(cr, x + width - margin, y + top_margin,
diff --git a/clients/gears.c b/clients/gears.c
index 22312bdc..3b4f3d36 100644
--- a/clients/gears.c
+++ b/clients/gears.c
@@ -332,7 +332,7 @@ gears_create(struct display *display)
 		die("failed to create context\n");
 
 	if (!eglMakeCurrent(gears->display, NULL, NULL, gears->context))
-		die("faile to make context current\n");
+		die("failed to make context current\n");
 
 	for (i = 0; i < 3; i++) {
 		gears->gear_list[i] = glGenLists(1);