Fixes for push to the store