More usability fixes