fix backporting issues