Adjustments to support a matrix CI build.