diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh
index a459d4644..1960190dd 100644
--- a/src/hb-ot-layout-common.hh
+++ b/src/hb-ot-layout-common.hh
@@ -2656,7 +2656,7 @@ struct FeatureTableSubstitution
     + substitutions.iter ()
     | hb_apply (subset_record_array (l, &(out->substitutions), this))
     ;
-    return_trace (bool (out->substitutions));
+    return_trace (true);
   }
 
   bool sanitize (hb_sanitize_context_t *c) const
diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh
index 88ffa88e8..5ce832f4d 100644
--- a/src/hb-ot-layout-gsubgpos.hh
+++ b/src/hb-ot-layout-gsubgpos.hh
@@ -3125,7 +3125,7 @@ struct GSUBGPOS
       if (!ret)
       {
         out->version.major = 1;
-        out->version.major = 0;
+        out->version.minor = 0;
       }
     }
 #endif