fixing minor issues caused by caching