Pull request for tiny fixes

Let's not let this PR get to 21 commits maybe...