More CI fixes