Modified more JSON defaults