Addressing CI build errors.