JSON fixes

Argh, forgot how much Not-Fun JSON syntax was.