Fixed small issues in upgrade procedures.