Fix after JSON format changes.