fix places to work with mock data