Fixing some json response parsing issues