Fix a few error messages and other strangeness on `make update` in a clean tree