Fix JSON errors, few more to go.