fix upgrade plan with messages