Json fixes

merge into main branch