Tweaked the packages to correctly install some missing pieces.