Snap to zero crossings bugfixes