Don't accidentally lock ourselves out of 2-factor
Properly manage tncc being killed