TC couple of minor bug fixes