New pull request: Fixing things!

See commits for details.