Tweaks to use new version of json_api