Tweaks for JSON creator to work