Installer tweaks