Fix build and test after backports