Small changes to make it work in CCL