Installer clean-up and fixes.