More fixes for install script