Further install script tweaks