Small changes to visitor