Fixing more JSON