Minor Store Fixes