Update to CCA4.0. Minor fixes