More install script modifications