Several usability fixes.