Tweaks to packaging code.