Tweaked both the multi and the single ccl build scripts