Build dep updates

This closes both #3423 and #3412.