diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c
index 13d89c3a0..1df852f09 100644
--- a/channels/rdpei/client/rdpei_main.c
+++ b/channels/rdpei/client/rdpei_main.c
@@ -1567,9 +1567,8 @@ static void terminate_plugin_cb(GENERIC_DYNVC_PLUGIN* base)
 	free(rdpei->context);
 }
 
-static const IWTSVirtualChannelCallback geometry_callbacks = { rdpei_on_data_received,
-	                                                           NULL, /* Open */
-	                                                           rdpei_on_close, NULL };
+static const IWTSVirtualChannelCallback rdpei_callbacks = { rdpei_on_data_received, NULL, /* Open */
+	                                                        rdpei_on_close, NULL };
 
 /**
  * Function description
@@ -1580,5 +1579,5 @@ FREERDP_ENTRY_POINT(UINT VCAPITYPE rdpei_DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* p
 {
 	return freerdp_generic_DVCPluginEntry(pEntryPoints, RDPEI_TAG, RDPEI_DVC_CHANNEL_NAME,
 	                                      sizeof(RDPEI_PLUGIN), sizeof(GENERIC_CHANNEL_CALLBACK),
-	                                      &geometry_callbacks, init_plugin_cb, terminate_plugin_cb);
+	                                      &rdpei_callbacks, init_plugin_cb, terminate_plugin_cb);
 }
diff --git a/libfreerdp/core/gcc.c b/libfreerdp/core/gcc.c
index a32bc3c28..530253769 100644
--- a/libfreerdp/core/gcc.c
+++ b/libfreerdp/core/gcc.c
@@ -2168,7 +2168,7 @@ BOOL gcc_read_client_monitor_data(wStream* s, rdpMcs* mcs)
 		const INT32 bottom = Stream_Get_INT32(s);  /* bottom */
 		const UINT32 flags = Stream_Get_UINT32(s); /* flags */
 
-		if ((left > right) || (top > bottom))
+		if ((1ll * left > right) || (1ll * top > bottom))
 		{
 			WLog_Print(mcs->log, WLOG_ERROR, "rdpMonitor::rect %dx%d-%dx%d invalid", left, top,
 			           right, bottom);