Tweaks to package-add