Minor usability improvements