Move changes to json.c