catching up to recent json tweaks