Improve usability a little