More work on the installer code