Improving CI support.