upgrade manager fixes