diff --git a/backend/wayland/seat.c b/backend/wayland/seat.c
index c2bac46a..76c25fe5 100644
--- a/backend/wayland/seat.c
+++ b/backend/wayland/seat.c
@@ -468,7 +468,7 @@ struct wlr_wl_input_device *create_wl_input_device(
 
 	unsigned int vendor = 0, product = 0;
 
-	const char *type_name;
+	const char *type_name = "unknown";
 
 	switch (type) {
 	case WLR_INPUT_DEVICE_KEYBOARD:
diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c
index 5ce7c4e8..48775740 100644
--- a/tinywl/tinywl.c
+++ b/tinywl/tinywl.c
@@ -475,7 +475,7 @@ static void server_cursor_button(struct wl_listener *listener, void *data) {
 	wlr_seat_pointer_notify_button(server->seat,
 			event->time_msec, event->button, event->state);
 	double sx, sy;
-	struct wlr_surface *surface;
+	struct wlr_surface *surface = NULL;
 	struct tinywl_view *view = desktop_view_at(server,
 			server->cursor->x, server->cursor->y, &surface, &sx, &sy);
 	if (event->state == WLR_BUTTON_RELEASED) {