Fix store bugs