Even more fixes from TC Repo