Various minor usability enhancements