A few usability improvements.