Fix a series of small JSON errors