Fixed #264 and #286 - snapping scroll