Minor edits

Some small changes. Left unbundled so you can cherry-pick if inclined.