some compatibility changes