Get shipments fixes