! Fixed some compatibility issues.