Minor build system improvements

Some improvements that enable building using Homebrew.

Not sure why your master is not at 2.0.7. This makes your 2.0.7 commit also end up in this pull request.