Some fix after json changes