diff --git a/lang/m2/comp/chk_expr.c b/lang/m2/comp/chk_expr.c
index d8afa9970..bfb77440d 100644
--- a/lang/m2/comp/chk_expr.c
+++ b/lang/m2/comp/chk_expr.c
@@ -1376,7 +1376,7 @@ int (*ExprChkTable[])() = {
 	ChkExLinkOrName,
 	NodeCrash,
 	ChkSet,
-	NodeCrash,
+	done_before,
 	NodeCrash,
 	ChkExLinkOrName,
 	NodeCrash
diff --git a/lang/m2/comp/cstoper.c b/lang/m2/comp/cstoper.c
index ffc737bdb..2d152374c 100644
--- a/lang/m2/comp/cstoper.c
+++ b/lang/m2/comp/cstoper.c
@@ -525,7 +525,7 @@ CutSize(expr)
 
 	assert(expr->nd_class == Value);
 	if (tp->tp_fund != T_INTEGER) {
-		expr->nd_INT &= full_mask[tp->tp_size];
+		expr->nd_INT &= full_mask[(int)(tp->tp_size)];
 	}
 	else {
 		int nbits = (int) (mach_long_size - tp->tp_size) * 8;