Installer fixes