Some fix after json changes

not so good