Further install script fixes