TConstruct compatibility and small fixes.