Misc usability improvements