Making some compatibility edits