Fix issues with building from a CI server.