fixes for new core