Fix some stuff from recent pull requests
5 files changed