diff --git a/server/shadow/shadow_capture.c b/server/shadow/shadow_capture.c
index 7ed825cc6..3393d9fa7 100644
--- a/server/shadow/shadow_capture.c
+++ b/server/shadow/shadow_capture.c
@@ -210,8 +210,6 @@ static pixel_equal_fn_t get_comparison_fn(DWORD format1, DWORD format2)
 	}
 	else
 		return pixel_equal_no_alpha;
-
-	return pixel_equal;
 }
 
 int shadow_capture_compare_with_format(const BYTE* WINPR_RESTRICT pData1, UINT32 format1,
diff --git a/winpr/libwinpr/comm/comm_serial_sys.c b/winpr/libwinpr/comm/comm_serial_sys.c
index d2e72faa8..0877ea649 100644
--- a/winpr/libwinpr/comm/comm_serial_sys.c
+++ b/winpr/libwinpr/comm/comm_serial_sys.c
@@ -1488,7 +1488,7 @@ static BOOL wait_on_mask(WINPR_COMM* pComm, ULONG* pOutputMask)
 			WINPR_ASSERT(*pOutputMask == 0);
 
 			LeaveCriticalSection(&pComm->EventsLock);
-			return unlock_return(pComm, TRUE);
+			break;
 		}
 
 		consume_event(pComm, pOutputMask, SERIAL_EV_RXCHAR);
@@ -1508,7 +1508,7 @@ static BOOL wait_on_mask(WINPR_COMM* pComm, ULONG* pOutputMask)
 		 * not pOutputMask */
 
 		if (*pOutputMask != 0)
-			return unlock_return(pComm, TRUE);
+			break;
 
 		/* waiting for a modification of PendingEvents.
 		 *
@@ -1521,7 +1521,7 @@ static BOOL wait_on_mask(WINPR_COMM* pComm, ULONG* pOutputMask)
 		Sleep(100); /* 100 ms */
 	}
 
-	return unlock_return(pComm, FALSE);
+	return unlock_return(pComm, TRUE);
 }
 
 static BOOL set_break_on(WINPR_COMM* pComm)