Fixes for double tc