Random small fixes

Three small things that were in separate pull requests of mine that didn't get merged.