Some fixes to JSON Objects