Couple of fixes to the visitor