Changes also for CI.