further json fixes