Changes to support next versions of ui changes.