Minor packaging tweaks.