diff --git a/clients/simple-touch.c b/clients/simple-touch.c
index b45cba53..d93aaaaa 100644
--- a/clients/simple-touch.c
+++ b/clients/simple-touch.c
@@ -118,7 +118,7 @@ input_device_handle_key(void *data, struct wl_input_device *input_device,
 }
 
 static void
-input_device_handle_pointer_focus(void *data,
+input_device_handle_pointer_enter(void *data,
 				  struct wl_input_device *input_device,
 				  uint32_t time, struct wl_surface *surface,
 				  int32_t sx, int32_t sy)
@@ -126,7 +126,14 @@ input_device_handle_pointer_focus(void *data,
 }
 
 static void
-input_device_handle_keyboard_focus(void *data,
+input_device_handle_pointer_leave(void *data,
+				  struct wl_input_device *input_device,
+				  uint32_t time, struct wl_surface *surface)
+{
+}
+
+static void
+input_device_handle_keyboard_enter(void *data,
 				   struct wl_input_device *input_device,
 				   uint32_t time,
 				   struct wl_surface *surface,
@@ -134,6 +141,14 @@ input_device_handle_keyboard_focus(void *data,
 {
 }
 
+static void
+input_device_handle_keyboard_leave(void *data,
+				   struct wl_input_device *input_device,
+				   uint32_t time,
+				   struct wl_surface *surface)
+{
+}
+
 static void
 touch_paint(struct touch *touch, int32_t x, int32_t y, int32_t id)
 {
@@ -213,8 +228,10 @@ static const struct wl_input_device_listener input_device_listener = {
 	input_device_handle_motion,
 	input_device_handle_button,
 	input_device_handle_key,
-	input_device_handle_pointer_focus,
-	input_device_handle_keyboard_focus,
+	input_device_handle_pointer_enter,
+	input_device_handle_pointer_leave,
+	input_device_handle_keyboard_enter,
+	input_device_handle_keyboard_leave,
 	input_device_handle_touch_down,
 	input_device_handle_touch_up,
 	input_device_handle_touch_motion,
diff --git a/src/compositor.c b/src/compositor.c
index 1bfe9521..b45a8181 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -631,7 +631,7 @@ destroy_surface(struct wl_resource *resource)
 	pixman_region32_fini(&surface->transform.boundingbox);
 	pixman_region32_fini(&surface->damage);
 	pixman_region32_fini(&surface->opaque);
-	if (!region_is_undefined(&surface->input)
+	if (!region_is_undefined(&surface->input))
 		pixman_region32_fini(&surface->input);
 
 	free(surface);