Clean up some minor issue with JSON