Minor usability fixes