Conflicting ADC again
Fixed Build Errors