Various shipping-related fixes