Fixed Ibon's scripts so that we can compile CAAT
Compiled CAAT with our patches