Minor fixes (snapping)