Fixing json format issues