Orderv2 shipping fixes