Fix superficial build test errors

6 jobs for master in 3855 minutes and 21 seconds (queued for 1 second)