Changes to support the CI build.