Fixed issues encountered when processing the JSON dump.