Couple of more fixes to TP Visitor