More changes to the installer generator