Misc fixes
Fix backporting