ANNPLT-98:  Fix a few minor regressions from the recent UX reboot