Fix conversion of timer source and CFs