Some fixups in install script