Small usability improvements

Was doing some rainy-day mopping up some of my repos and noticed I never submitted these couple of minor changes.