Fixed upgrade process