Fixes and changes to the JSON format