[#OPINST-2: Adjust some things in upgrade]