Minor improvements to TVC