Fixes for json files