Fixed some compatibility