More CCSR build system fixes