diff --git a/client/Wayland/wlf_input.c b/client/Wayland/wlf_input.c
index 9ab2fff67..f5232d48b 100644
--- a/client/Wayland/wlf_input.c
+++ b/client/Wayland/wlf_input.c
@@ -140,8 +140,7 @@ BOOL wlf_handle_pointer_axis(freerdp* instance, const UwacPointerAxisEvent* ev)
 		return FALSE;
 
 	context = (wlfContext*)instance->context;
-	ArrayList_Append(context->events, ev);
-	return TRUE;
+	return ArrayList_Append(context->events, ev);
 }
 
 BOOL wlf_handle_pointer_axis_discrete(freerdp* instance, const UwacPointerAxisEvent* ev)
@@ -151,8 +150,7 @@ BOOL wlf_handle_pointer_axis_discrete(freerdp* instance, const UwacPointerAxisEv
 		return FALSE;
 
 	context = (wlfContext*)instance->context;
-	ArrayList_Append(context->events, ev);
-	return TRUE;
+	return ArrayList_Append(context->events, ev);
 }
 
 static BOOL wlf_handle_wheel(freerdp* instance, uint32_t x, uint32_t y, uint32_t axis,
@@ -289,8 +287,7 @@ BOOL wlf_handle_pointer_source(freerdp* instance, const UwacPointerSourceEvent*
 		return FALSE;
 
 	context = (wlfContext*)instance->context;
-	ArrayList_Append(context->events, ev);
-	return TRUE;
+	return ArrayList_Append(context->events, ev);
 }
 
 BOOL wlf_handle_key(freerdp* instance, const UwacKeyEvent* ev)
diff --git a/client/Windows/wf_rail.c b/client/Windows/wf_rail.c
index ed6d937f7..8ac62dac2 100644
--- a/client/Windows/wf_rail.c
+++ b/client/Windows/wf_rail.c
@@ -433,6 +433,7 @@ static BOOL wf_rail_window_common(rdpContext* context, const WINDOW_ORDER_INFO*
 
 	if (fieldFlags & WINDOW_ORDER_STATE_NEW)
 	{
+		BOOL rc;
 		HANDLE hInstance;
 		WCHAR* titleW = NULL;
 		WNDCLASSEX wndClassEx;
@@ -525,10 +526,11 @@ static BOOL wf_rail_window_common(rdpContext* context, const WINDOW_ORDER_INFO*
 		}
 
 		SetWindowLongPtr(railWindow->hWnd, GWLP_USERDATA, (LONG_PTR)railWindow);
-		HashTable_Insert(wfc->railWindows, (void*)(UINT_PTR)orderInfo->windowId, (void*)railWindow);
+		rc = HashTable_Insert(wfc->railWindows, (void*)(UINT_PTR)orderInfo->windowId,
+		                      (void*)railWindow);
 		free(titleW);
 		UpdateWindow(railWindow->hWnd);
-		return TRUE;
+		return rc;
 	}
 	else
 	{