diff --git a/libweston/color-lcms/color-transform.c b/libweston/color-lcms/color-transform.c
index 1bf98cca4..7eeb26d2e 100644
--- a/libweston/color-lcms/color-transform.c
+++ b/libweston/color-lcms/color-transform.c
@@ -1314,10 +1314,10 @@ init_icc_to_icc_chain(struct cmlcms_color_transform *xform)
 	struct lcmsProfilePtr chain[5];
 	unsigned chain_len = 0;
 
-	weston_assert_u32_eq(cm->base.compositor, out_prof->type, CMLCMS_PROFILE_TYPE_ICC);
+	weston_assert_enum(cm->base.compositor, out_prof->type, CMLCMS_PROFILE_TYPE_ICC);
 	if (in_prof) {
-		weston_assert_u32_eq(cm->base.compositor, in_prof->type,
-				     CMLCMS_PROFILE_TYPE_ICC);
+		weston_assert_enum(cm->base.compositor, in_prof->type,
+				   CMLCMS_PROFILE_TYPE_ICC);
 	}
 
 	render_intent = xform->search_key.render_intent;
@@ -1393,9 +1393,9 @@ init_blend_to_parametric(struct cmlcms_color_transform *xform)
 {
 	struct weston_color_profile_params *out = xform->search_key.output_profile->params;
 
-	weston_assert_u32_eq(xform->base.cm->compositor,
-			     xform->search_key.output_profile->type,
-			     CMLCMS_PROFILE_TYPE_PARAMS);
+	weston_assert_enum(xform->base.cm->compositor,
+			   xform->search_key.output_profile->type,
+			   CMLCMS_PROFILE_TYPE_PARAMS);
 
 	/*
 	 * For blend-to-output with a parametric output profile, all we need
@@ -1560,10 +1560,10 @@ init_parametric_to_parametric(struct cmlcms_color_transform *xform)
 	struct weston_mat4f mat;
 	char *errmsg = NULL;
 
-	weston_assert_u32_eq(cm->base.compositor, recipe->input_profile->type,
-			     CMLCMS_PROFILE_TYPE_PARAMS);
-	weston_assert_u32_eq(cm->base.compositor, recipe->output_profile->type,
-			     CMLCMS_PROFILE_TYPE_PARAMS);
+	weston_assert_enum(cm->base.compositor, recipe->input_profile->type,
+			   CMLCMS_PROFILE_TYPE_PARAMS);
+	weston_assert_enum(cm->base.compositor, recipe->output_profile->type,
+			   CMLCMS_PROFILE_TYPE_PARAMS);
 
 	/*
 	 * Decode input TF
diff --git a/libweston/color-noop.c b/libweston/color-noop.c
index 56ec01fd3..19b1a7ea1 100644
--- a/libweston/color-noop.c
+++ b/libweston/color-noop.c
@@ -245,7 +245,7 @@ cmnoop_destroy(struct weston_color_manager *cm_base)
 	 * Currently we have a bug in which we leak surfaces when shutting down
 	 * Weston with client surfaces alive, and these surfaces may have a
 	 * reference to the stock sRGB profile. */
-	weston_assert_u32_ge(cm_base->compositor,
+	weston_assert_s32_ge(cm_base->compositor,
 			     cmnoop->stock_cprof->base.ref_count, 1);
 	unref_cprof(cmnoop->stock_cprof);
 
diff --git a/libweston/color-profile-param-builder.c b/libweston/color-profile-param-builder.c
index 628397316..5957a9b8f 100644
--- a/libweston/color-profile-param-builder.c
+++ b/libweston/color-profile-param-builder.c
@@ -311,8 +311,8 @@ weston_color_profile_param_builder_set_tf_named(struct weston_color_profile_para
 		return false;
 
 	builder->params.tf_info = weston_color_tf_info_from(compositor, tf);
-	weston_assert_u32_eq(builder->compositor,
-			     builder->params.tf_info->count_parameters, 0);
+	weston_assert_uint_eq(builder->compositor,
+			      builder->params.tf_info->count_parameters, 0);
 
 	builder->group_mask |= WESTON_COLOR_PROFILE_PARAMS_TF;
 
diff --git a/libweston/color.c b/libweston/color.c
index cc330e739..ec5cb3a96 100644
--- a/libweston/color.c
+++ b/libweston/color.c
@@ -260,7 +260,7 @@ weston_color_curve_enum_get_parametric(struct weston_compositor *compositor,
 	}
 
 	/* No other TF's have params. */
-	weston_assert_u32_eq(compositor, curve->tf->count_parameters, 0);
+	weston_assert_uint_eq(compositor, curve->tf->count_parameters, 0);
 
 	if (!curve->tf->curve_params_valid)
 		return false;