Minor usability updates