Trying to improve CI reliability