store fixes