Resolve some CI failures.