Major guide snapping improvements