Older CC version comparability fixes