Adjustments to CI script