Some changes for CCL and fixes for the demos.