Several changes

I'm too lazy to do these as separate PRs.