minor fixes to TFA support, also fixed regressions