Shipping fixes for external shipping modules.