diff --git a/src/hb-cff-interp-cs-common.hh b/src/hb-cff-interp-cs-common.hh
index ab9aa0028..72f4061fb 100644
--- a/src/hb-cff-interp-cs-common.hh
+++ b/src/hb-cff-interp-cs-common.hh
@@ -105,7 +105,7 @@ struct CSInterpEnv : InterpEnv<ARG>
                    !SUPER::argStack.check_pop_int (n))))
       return false;
     n += biasedSubrs.bias;
-    if (unlikely ((n < 0) || (n >= biasedSubrs.subrs->count)))
+    if (unlikely ((n < 0) || ((unsigned int)n >= biasedSubrs.subrs->count)))
       return false;
 
     subr_num = (unsigned int)n;
diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc
index ce3a7e3f0..8a75b8a93 100644
--- a/src/hb-subset-cff1.cc
+++ b/src/hb-subset-cff1.cc
@@ -351,8 +351,8 @@ struct cff_subset_plan {
     : final_size (0),
       orig_fdcount (0),
       subset_fdcount (1),
-      subset_fdselect_format (0),
       offsets (),
+      subset_fdselect_format (0),
       drop_hints (false)
   {
     topdict_sizes.init ();