More node snapping fixes.