Adjust after JSON changes

(cherry picked from commit 84074309b99957020e2cb9386ab72c97078e82fc)