Fix bugs on creating a new Store