Minor usability improvements.