TFC/UW compat

Compat between TFC and UW