Small fixes

Lets leave this open for a bit so that I don't keep opening individual PRs for lots of small issues.