More JSON tweaking