Some packaging tweaks.