Fix extra-packaging steps.