Trying to fix CI failures