more propose-patch fixups