more fixes for json wrappers