some compatibility problems fixed