Some tweaks to core.json