Several changes that made TvC work more.