Usability fixes from tchu.