Small UX fixes

Fixes #1991