Small tweaks to the Json contribution.