More JSON parser fixing