tweaks to get building on ccl