Minor usability changes