Furhter install script tweaks