More CI fixes.