Fix store/feature bugs.