Tweaks for reverting to TC 4.0.6