diff --git a/TODO b/TODO
index a6ea9b8..0aa77f3 100644
--- a/TODO
+++ b/TODO
@@ -260,4 +260,6 @@ Get wayland cursor position for region selector, otherwise the start position be
 
 Add option to set preset on nvidia. Use -ffmpeg-video-opts for that.
 
-Webcam resolution list is too long for some people. Fix it by separating resolution and framerate. Sort resolution and framerate from highest to lowest. Add scrollbar for dropdown list.
+Webcam resolution list is too long for some people. Fix it by separating resolution and framerate. Sort resolution and framerate from highest to lowest. Add scrollbar for dropdown list. POOP. Add --filesystem=xdg-run/hypr and run the gsr-hyprland-helper directly instead of flatpak spawn or use wlr foreign top level window protocol. Nvidia webcam yuyv capture doesn't seem to work on x11?
+
+Allow settings page to select input capture option/audio, to make sure it doesn't blindly select the default option when the sources aren't temporary available when opening the settings.
diff --git a/src/main.cpp b/src/main.cpp
index 3f86f15..d3490d7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -168,7 +168,7 @@ static void set_display_server_environment_variables() {
 
     const char *wayland_display = getenv("WAYLAND_DISPLAY");
     if(!wayland_display) {
-        wayland_display = "wayland-1";
+        wayland_display = "wayland-0";
         setenv("WAYLAND_DISPLAY", wayland_display, true);
     }
 }
diff --git a/tools/gsr-global-hotkeys/keyboard_event.c b/tools/gsr-global-hotkeys/keyboard_event.c
index f070e12..81f415c 100644
--- a/tools/gsr-global-hotkeys/keyboard_event.c
+++ b/tools/gsr-global-hotkeys/keyboard_event.c
@@ -927,7 +927,7 @@ static void keyboard_event_process_stdin_command_data(keyboard_event *self, int
         return;
 
     const char *command_start = self->stdin_command_data;
-    const char *search = self->stdin_command_data + self->stdin_command_data_size;
+    char *search = self->stdin_command_data + self->stdin_command_data_size;
     const char *end = search + bytes_read;
     self->stdin_command_data_size += bytes_read;