Minor CI fixes