Fixes for ui changes