core.js fixes