Store cleaning and fixes