Changes for updated cloog and isl