Rolling together small PRs

This passed `make check` locally, so hopefully it passes on bors!