Minor fixes to visitors