Even more JSON parser fixing