Fixes to TD6