Misc package build improvements

Some more improvements!