fixes for use_split_shipments