Build fixes + new cxxcam build fixes