Fixed some lingering curr_visit errors