Installer bug fixes