Couple of updates to store handling.