Some usability improvements