Temporal fixes for json