Fixed some compatibility stuff