More tweaks to install script