Addressing CI build errors part 2.