More fixes due to JSON module version change