more json fixes #2268