added upgrade process fixes