diff --git a/meson.build b/meson.build
index 9c846c2..042fb03 100644
--- a/meson.build
+++ b/meson.build
@@ -23,10 +23,8 @@ cc = meson.get_compiler('c')
 # Adding include directory
 inc_dir = include_directories('include')
 
-# Due to the planned refactor of xdg_shell in wlroots 0.16.0, I doubt this will
-# build when it's released
 libxml2 = dependency('libxml-2.0')
-wlroots = dependency('wlroots', version: ['>=0.15.0', '<0.16.0'])
+wlroots = dependency('wlroots', version: '>=0.15.0')
 wayland_server = dependency('wayland-server', version: '>=1.15')
 wayland_protos  = dependency('wayland-protocols', version: '>=1.17')
 xkbcommon  = dependency('xkbcommon')
diff --git a/waybox/cursor.c b/waybox/cursor.c
index 8655540..e5304ad 100644
--- a/waybox/cursor.c
+++ b/waybox/cursor.c
@@ -116,7 +116,7 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) {
 	wlr_seat_pointer_notify_button(cursor->server->seat->seat,
 			event->time_msec, event->button, event->state);
 	double sx, sy;
-	struct wlr_surface *surface;
+	struct wlr_surface *surface = NULL;
 	struct wb_view *view = desktop_view_at(cursor->server,
 			cursor->server->cursor->cursor->x, cursor->server->cursor->cursor->y, &surface, &sx, &sy);
 	if (event->state == WLR_BUTTON_RELEASED) {