Multiple fixes from TC Repo