Fixed issues encountered when processing the JSON dump.
Merge branch 'externalJsonReader' into cleaner-examples
Some smaller fixes