Installer script fixes