diff --git a/src/xf86libinput.c b/src/xf86libinput.c
index 69f7ae3..b8e1145 100644
--- a/src/xf86libinput.c
+++ b/src/xf86libinput.c
@@ -1296,12 +1296,7 @@ xf86libinput_handle_axis(InputInfoPtr pInfo, struct libinput_event_pointer *even
 
 	axis = LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL;
 	if (libinput_event_pointer_has_axis(event, axis)) {
-		if (source == LIBINPUT_POINTER_AXIS_SOURCE_WHEEL) {
-			value = libinput_event_pointer_get_axis_value_discrete(event, axis);
-			value *= driver_data->scroll.vdist;
-		} else {
-			value = libinput_event_pointer_get_axis_value(event, axis);
-		}
+		value = libinput_event_pointer_get_axis_value(event, axis);
 		valuator_mask_set_double(mask, 3, value);
 	}
 
@@ -1310,12 +1305,7 @@ xf86libinput_handle_axis(InputInfoPtr pInfo, struct libinput_event_pointer *even
 
 	axis = LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL;
 	if (libinput_event_pointer_has_axis(event, axis)) {
-		if (source == LIBINPUT_POINTER_AXIS_SOURCE_WHEEL) {
-			value = libinput_event_pointer_get_axis_value_discrete(event, axis);
-			value *= driver_data->scroll.hdist;
-		} else {
-			value = libinput_event_pointer_get_axis_value(event, axis);
-		}
+		value = libinput_event_pointer_get_axis_value(event, axis);
 		valuator_mask_set_double(mask, 2, value);
 	}
 
@@ -2146,10 +2136,10 @@ xf86libinput_parse_tap_buttonmap_option(InputInfoPtr pInfo,
 		free(str);
 	}
 
-	if (libinput_device_config_tap_set_button_map(device, map) !=
+	if (libinput_device_config_send_events_set_mode(device, map) !=
 	    LIBINPUT_CONFIG_STATUS_SUCCESS) {
 		xf86IDrvMsg(pInfo, X_ERROR,
-			    "Failed to set Tapping Button Map to %d\n",
+			    "Failed to set Tapping Drag Lock to %d\n",
 			    map);
 		map = libinput_device_config_tap_get_button_map(device);
 	}