CC Compatibility Updates.