Patched the CCI stuff, hopefully getting a working build now