Fixing rest of JSON errors