More changes for TVRC build