avr: some fixes to applying proper channel