Tweaks to usability