More changes for the Installer

These changes had to be made for the installer to work but I forgot to make a PR, sorry for this