More json parse corrections
More parse corrections