More tweaks to help packagers.