Attempt to fix CI build with cpp issues