some more packaging tweaks