Fix json, prep for build