fixes for json format