Edit some compatibility issues