Fixes for package builds after commit f95272d.

Package builds did not run clean (contrary to what I said in the pull request).  These changes should fix that.