Usability fixes.