Fixes to compile in CCL