Fix up errors in CI build