Updated some build dependencies

Partially addresses #6011