This should fix most of the other wonky-ness with snapping...