Miscellaneous fixups

Just some minor fixups for the cpack stuff.