Fixed issues with JSON.