Add some usability fixes.