Minor updates to JSON output.