More minor tweaks to the packager.