Fix problems from old JSON

Just a quick fix to some of the most obvious problems (references to the
old JSON).