Typedef fix for CCL