Minor updates to JSON Parser