Small tweaks

This PR contains just the first three commits from #1 which you asked me to supply separately.