Fix store locks