Minor changes to improve usability.