Fix various DTC errors