Various usability fixes