Fix issues when loading stores