Fix CLIRR setup