Fixes to make UI work after merge