Various fixups for package scripts.