A few tweaks to usability