I fixed both. You suggest dropping `core.js` changes?, that makes sense.