Fixes for TCR driver