Receipt and store fixes