Fixes to visit and visibility