Fixes for CCL