Various customer store fixes