Misc fixes
Misc fixes / UX improvements