pickup store fixes