Build dep updates

This closes both #3423 and #3412.
This should be `raise CheckFailed("...")` otherwise you are going to get a positive (yes) return