IVisitor fixes