Minor usability adjustments