diff --git a/cmake/setup.cmake b/cmake/setup.cmake
index 0ad84df9..7a650771 100644
--- a/cmake/setup.cmake
+++ b/cmake/setup.cmake
@@ -4,8 +4,8 @@
 # give a #error if this manoeuvre doesn't do what it needs to.
 string(REPLACE "/DNDEBUG" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
 string(REPLACE "-DNDEBUG" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
-string(REPLACE "/DNDEBUG" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE}")
-string(REPLACE "-DNDEBUG" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE}")
+string(REPLACE "/DNDEBUG" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+string(REPLACE "-DNDEBUG" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
 
 set(PUTTY_IPV6 ON
   CACHE BOOL "Build PuTTY with IPv6 support if possible")
diff --git a/windows/window.c b/windows/window.c
index 85c546ba..bb770fdd 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -2074,7 +2074,7 @@ static bool is_alt_pressed(void)
 
 static bool resizing;
 
-static void win_seat_notify_remote_exit(Seat *seat)
+static void exit_callback(void *vctx)
 {
     int exitcode, close_on_exit;
 
@@ -2101,6 +2101,11 @@ static void win_seat_notify_remote_exit(Seat *seat)
     }
 }
 
+static void win_seat_notify_remote_exit(Seat *seat)
+{
+    queue_toplevel_callback(exit_callback, NULL);
+}
+
 void timer_change_notify(unsigned long next)
 {
     unsigned long now = GETTICKCOUNT();