Four minor tweaks

Let me know if you'd like me to split these up in individual pull requests.