Buildfixes from homebrew merge.