diff --git a/client/X11/xf_monitor.c b/client/X11/xf_monitor.c
index c8fffdf63..9eb854e54 100644
--- a/client/X11/xf_monitor.c
+++ b/client/X11/xf_monitor.c
@@ -136,7 +136,7 @@ static BOOL xf_is_monitor_id_active(xfContext* xfc, UINT32 id)
 
 BOOL xf_detect_monitors(xfContext* xfc, UINT32* pMaxWidth, UINT32* pMaxHeight)
 {
-	int i;
+	UINT32 i;
 	int nmonitors = 0;
 	int monitor_index = 0;
 	BOOL primaryMonitorFound = FALSE;
diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c
index 813cf8eff..02f720eb2 100644
--- a/client/X11/xf_window.c
+++ b/client/X11/xf_window.c
@@ -153,7 +153,7 @@ void xf_SetWindowMinimized(xfContext* xfc, xfWindow* window)
 
 void xf_SetWindowFullscreen(xfContext* xfc, xfWindow* window, BOOL fullscreen)
 {
-	int i;
+	UINT32 i;
 	rdpSettings* settings = xfc->context.settings;
 	int startX, startY;
 	UINT32 width = window->width;
diff --git a/include/freerdp/settings.h b/include/freerdp/settings.h
index 058b43209..9feb945f3 100644
--- a/include/freerdp/settings.h
+++ b/include/freerdp/settings.h
@@ -937,7 +937,7 @@ struct rdp_settings
 	UINT64 padding0384[384 - 323]; /* 323 */
 
 	/* Client Monitor Data */
-	ALIGN64 int         MonitorCount;         /*    384 */
+	ALIGN64 UINT32      MonitorCount;         /*    384 */
 	ALIGN64 UINT32      MonitorDefArraySize;  /*    385 */
 	ALIGN64 rdpMonitor* MonitorDefArray;      /*    386 */
 	ALIGN64 BOOL        SpanMonitors;         /*    387 */