diff --git a/channels/smartcard/client/smartcard_operations.c b/channels/smartcard/client/smartcard_operations.c
index e3d848171..336a05ae1 100644
--- a/channels/smartcard/client/smartcard_operations.c
+++ b/channels/smartcard/client/smartcard_operations.c
@@ -1215,8 +1215,6 @@ static LONG smartcard_StatusW_Call(SMARTCARD_DEVICE* smartcard, SMARTCARD_OPERAT
 	 */
 	cbAtrLen = call->cbAtrLen = 32;
 
-	call->cchReaderLen;
-
 	if (call->fmszReaderNamesIsNULL)
 		cchReaderLen = 0;
 	else
diff --git a/libfreerdp/codec/region.c b/libfreerdp/codec/region.c
index c5d19c806..28ad91a43 100644
--- a/libfreerdp/codec/region.c
+++ b/libfreerdp/codec/region.c
@@ -489,7 +489,6 @@ static BOOL region16_simplify_bands(REGION16* region)
 
 BOOL region16_union_rect(REGION16* dst, const REGION16* src, const RECTANGLE_16* rect)
 {
-	REGION16_DATA* data;
 	const RECTANGLE_16* srcExtents;
 	RECTANGLE_16* dstExtents;
 	const RECTANGLE_16* currentBand, *endSrcRect, *nextBand;
@@ -727,7 +726,6 @@ BOOL region16_intersects_rect(const REGION16* src, const RECTANGLE_16* arg2)
 
 BOOL region16_intersect_rect(REGION16* dst, const REGION16* src, const RECTANGLE_16* rect)
 {
-	REGION16_DATA* data;
 	REGION16_DATA* newItems;
 	const RECTANGLE_16* srcPtr, *endPtr, *srcExtents;
 	RECTANGLE_16* dstPtr;
diff --git a/libfreerdp/core/capabilities.c b/libfreerdp/core/capabilities.c
index 389724232..58151c835 100644
--- a/libfreerdp/core/capabilities.c
+++ b/libfreerdp/core/capabilities.c
@@ -2999,7 +2999,7 @@ static BOOL rdp_write_nsc_client_capability_container(wStream* s,
 
 #if defined(WITH_JPEG)
 static BOOL rdp_write_jpeg_client_capability_container(wStream* s,
-        rdpSettings* settings)
+		const rdpSettings* settings)
 {
 	if (!Stream_EnsureRemainingCapacity(s, 8))
 		return FALSE;
@@ -3027,7 +3027,7 @@ static BOOL rdp_write_rfx_server_capability_container(wStream* s,
 }
 
 static BOOL rdp_write_jpeg_server_capability_container(wStream* s,
-        rdpSettings* settings)
+		const rdpSettings* settings)
 {
 	if (!Stream_EnsureRemainingCapacity(s, 8))
 		return FALSE;
diff --git a/libfreerdp/core/license.c b/libfreerdp/core/license.c
index d17566069..3bc0acbce 100644
--- a/libfreerdp/core/license.c
+++ b/libfreerdp/core/license.c
@@ -141,7 +141,7 @@ static void license_print_product_info(const LICENSE_PRODUCT_INFO* productInfo)
 
 static void license_print_scope_list(const SCOPE_LIST* scopeList)
 {
-	int index;
+	UINT32 index;
 	const LICENSE_BLOB* scope;
 	WLog_INFO(TAG, "ScopeList (%"PRIu32"):", scopeList->count);
 
diff --git a/server/proxy/pf_config.c b/server/proxy/pf_config.c
index 392da538e..44b6d60ae 100644
--- a/server/proxy/pf_config.c
+++ b/server/proxy/pf_config.c
@@ -33,8 +33,8 @@
 #define CONFIG_PRINT_SECTION(section) WLog_INFO(TAG, "\t%s:", section)
 #define CONFIG_PRINT_STR(config, key) WLog_INFO(TAG, "\t\t%s: %s", #key, config->key)
 #define CONFIG_PRINT_BOOL(config, key) WLog_INFO(TAG, "\t\t%s: %s", #key, config->key ? "TRUE" : "FALSE")
-#define CONFIG_PRINT_UINT16(config, key) WLog_INFO(TAG, "\t\t%s: %"PRIu16"", #key, config->key);
-#define CONFIG_PRINT_UINT32(config, key) WLog_INFO(TAG, "\t\t%s: %"PRIu32"", #key, config->key);
+#define CONFIG_PRINT_UINT16(config, key) WLog_INFO(TAG, "\t\t%s: %"PRIu16"", #key, config->key)
+#define CONFIG_PRINT_UINT32(config, key) WLog_INFO(TAG, "\t\t%s: %"PRIu32"", #key, config->key)
 
 static BOOL pf_config_get_uint16(wIniFile* ini, const char* section, const char* key, UINT16* result)
 {
@@ -56,7 +56,7 @@ static BOOL pf_config_get_uint32(wIniFile* ini, const char* section, const char*
 	int val;
 
 	val = IniFile_GetKeyValueInt(ini, section, key);
-	if ((val < 0) || (val > UINT32_MAX))
+	if ((val < 0) || (val > INT32_MAX))
 	{
 		WLog_ERR(TAG, "pf_config_get_uint32(): invalid value %d for section '%s', key '%s'!", val, section, key);
 		return FALSE;
@@ -126,7 +126,7 @@ static BOOL pf_config_load_clipboard(wIniFile* ini, proxyConfig* config)
 
 static BOOL pf_config_load_modules(wIniFile* ini, proxyConfig* config)
 {
-	UINT32 index;
+	int index;
 	int modules_count = 0;
 	char** module_names = NULL;