Json fixes

merging into main