diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 1a16c9b0cf..595858bb08 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -628,6 +628,6 @@ $(BUILD)/frozen_mpy: $(FROZEN_MPY_DIRS)
 
 $(BUILD)/manifest.py: $(BUILD)/frozen_mpy | $(TOP)/py/circuitpy_mpconfig.mk mpconfigport.mk boards/$(BOARD)/mpconfigboard.mk
 	$(ECHO) MKMANIFEST $(FROZEN_MPY_DIRS)
-	(cd $(BUILD)/frozen_mpy && find * -name \*.py -exec printf 'freeze_as_mpy("frozen_mpy", "%s")\n' {} \; )> $@.tmp && mv -f $@.tmp $@
+	$(Q)(cd $(BUILD)/frozen_mpy && find * -name \*.py -exec printf 'freeze_as_mpy("frozen_mpy", "%s")\n' {} \; )> $@.tmp && mv -f $@.tmp $@
 FROZEN_MANIFEST=$(BUILD)/manifest.py
 endif
diff --git a/py/mkrules.mk b/py/mkrules.mk
index 0121c3aefd..730ac9704f 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -8,7 +8,6 @@ endif
 OBJ_EXTRA_ORDER_DEPS =
 
 # Generate moduledefs.h.
-SRC_QSTR += $(HEADER_BUILD)/devices.h
 OBJ_EXTRA_ORDER_DEPS += $(HEADER_BUILD)/moduledefs.h
 
 ifeq ($(MICROPY_ROM_TEXT_COMPRESSION),1)
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 485ee58322..fce2c0bac7 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -82,7 +82,7 @@ STATIC mp_obj_t gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_kw, cons
 
 const mp_obj_type_t mp_type_gen_wrap = {
     { &mp_type_type },
-    .flags = MP_TYPE_FLAG_BINDS_SELF,
+    .flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_EXTENDED,
     .name = MP_QSTR_generator,
     #if MICROPY_PY_FUNCTION_ATTRS
     .attr = mp_obj_fun_bc_attr,
@@ -148,7 +148,7 @@ STATIC mp_obj_t native_gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_k
 
 const mp_obj_type_t mp_type_native_gen_wrap = {
     { &mp_type_type },
-    .flags = MP_TYPE_FLAG_BINDS_SELF,
+    .flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_EXTENDED,
     .name = MP_QSTR_generator,
     #if MICROPY_PY_FUNCTION_ATTRS
     .attr = gen_attr,
diff --git a/shared-bindings/gnss/__init__.c b/shared-bindings/gnss/__init__.c
index 7fe1b06e16..4409b0be1b 100644
--- a/shared-bindings/gnss/__init__.c
+++ b/shared-bindings/gnss/__init__.c
@@ -29,4 +29,4 @@ const mp_obj_module_t gnss_module = {
     .globals = (mp_obj_dict_t *)&gnss_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_gnss, gnss_modulex);
+MP_REGISTER_MODULE(MP_QSTR_gnss, gnss_module);