Fixes to json