Minor UX fixes