diff --git a/server/proxy/pf_config.c b/server/proxy/pf_config.c
index 7d2055d5b..798930682 100644
--- a/server/proxy/pf_config.c
+++ b/server/proxy/pf_config.c
@@ -747,8 +747,16 @@ size_t pf_config_modules_count(const proxyConfig* config)
 
 const char** pf_config_modules(const proxyConfig* config)
 {
+	union
+	{
+		char** ppc;
+		const char** cppc;
+	} cnv;
+
 	WINPR_ASSERT(config);
-	return (const char**)config->Modules;
+
+	cnv.ppc = config->Modules;
+	return cnv.cppc;
 }
 
 static BOOL pf_config_copy_string(char** dst, const char* src)
diff --git a/server/shadow/X11/x11_shadow.c b/server/shadow/X11/x11_shadow.c
index 172f70b7f..253573150 100644
--- a/server/shadow/X11/x11_shadow.c
+++ b/server/shadow/X11/x11_shadow.c
@@ -343,7 +343,7 @@ static BOOL x11_shadow_input_extended_mouse_event(rdpShadowSubsystem* subsystem,
 {
 #ifdef WITH_XTEST
 	x11ShadowSubsystem* x11 = (x11ShadowSubsystem*)subsystem;
-	int button = 0;
+	UINT button = 0;
 	BOOL down = FALSE;
 	rdpShadowServer* server;
 	rdpShadowSurface* surface;