Some JSON fixes