Update to pass some compatibility tests