BARE-24: fix for errors in the UI.