diff --git a/waybox/cursor.c b/waybox/cursor.c
index e040b46..2c96d10 100644
--- a/waybox/cursor.c
+++ b/waybox/cursor.c
@@ -164,7 +164,7 @@ struct wb_cursor *wb_cursor_create(struct wb_server *server) {
 	cursor->cursor = wlr_cursor_create();
 	cursor->server = server;
 
-	cursor->xcursor_manager = wlr_xcursor_manager_create("default", 24);
+	cursor->xcursor_manager = wlr_xcursor_manager_create(NULL, 24);
 	wlr_xcursor_manager_load(cursor->xcursor_manager, 1);
 
 	cursor->cursor_motion.notify = handle_cursor_motion;
diff --git a/waybox/output.c b/waybox/output.c
index dddba71..2eed274 100644
--- a/waybox/output.c
+++ b/waybox/output.c
@@ -69,14 +69,12 @@ static void render_surface(struct wlr_surface *surface, int sx, int sy, void *da
 
 void output_frame_notify(struct wl_listener *listener, void *data) {
 	struct wb_output *output = wl_container_of(listener, output, frame);
-	struct wlr_output *wlr_output = data;
-	struct wlr_renderer *renderer = wlr_backend_get_renderer(
-								wlr_output->backend);
+	struct wlr_renderer *renderer = output->server->renderer;
 
 	struct timespec now;
 	clock_gettime(CLOCK_MONOTONIC, &now);
 
-	if (!wlr_output_attach_render(wlr_output, NULL)) {
+	if (!wlr_output_attach_render(output->wlr_output, NULL)) {
 		return;
 	}
 	int width, height;
@@ -103,8 +101,9 @@ void output_frame_notify(struct wl_listener *listener, void *data) {
 		wlr_xdg_surface_for_each_surface(view->xdg_surface, render_surface, &rdata);
 	}
 
+	wlr_output_render_software_cursors(output->wlr_output, NULL);
 	wlr_renderer_end(renderer);
-	wlr_output_commit(wlr_output);
+	wlr_output_commit(output->wlr_output);
 }
 
 void output_destroy_notify(struct wl_listener *listener, void *data) {