More adjustments to CKUpdater