Store Bug Fixes