improvements against upgrade/install situations