[BUGFIX] Fix various TCA issues