diff --git a/include/freerdp/server/proxy/proxy_config.h b/include/freerdp/server/proxy/proxy_config.h
index aff883411..8d1b14429 100644
--- a/include/freerdp/server/proxy/proxy_config.h
+++ b/include/freerdp/server/proxy/proxy_config.h
@@ -198,7 +198,7 @@ extern "C"
 	 * @brief pf_config_plugin Register a proxy plugin handling event filtering
 	 * defined in the configuration.
 	 *
-	 * @param plugins_manager
+	 * @param plugins_manager The plugin manager
 	 * @param userdata A proxyConfig* to use as reference
 	 *
 	 * @return  TRUE for success, FALSE for failure
diff --git a/server/proxy/channels/pf_channel_rdpdr.c b/server/proxy/channels/pf_channel_rdpdr.c
index 496198cc6..689b4e3b8 100644
--- a/server/proxy/channels/pf_channel_rdpdr.c
+++ b/server/proxy/channels/pf_channel_rdpdr.c
@@ -1131,7 +1131,9 @@ BOOL pf_channel_rdpdr_client_handle(pClientContext* pc, UINT16 channelId, const
 	pf_channel_client_context* rdpdr;
 	pServerContext* ps;
 	wStream* s;
+#if defined(WITH_PROXY_EMULATE_SMARTCARD)
 	UINT16 packetid;
+#endif
 
 	WINPR_ASSERT(pc);
 	WINPR_ASSERT(pc->pdata);
@@ -1248,10 +1250,10 @@ BOOL pf_channel_rdpdr_client_handle(pClientContext* pc, UINT16 channelId, const
 						return FALSE;
 				}
 			}
+			break;
 #else
 			return pf_channel_rdpdr_client_send_to_server(ps, s);
 #endif
-			break;
 		default:
 			WLog_ERR(TAG,
 			         "[%s]: Channel %s [0x%04" PRIx16
diff --git a/server/proxy/modules/capture/cap_protocol.c b/server/proxy/modules/capture/cap_protocol.c
index 30f18649f..dcf797a4d 100644
--- a/server/proxy/modules/capture/cap_protocol.c
+++ b/server/proxy/modules/capture/cap_protocol.c
@@ -49,12 +49,12 @@ wStream* capture_plugin_create_session_info_packet(pClientContext* pc)
 	if ((username_length == 0) || (username_length > UINT16_MAX))
 		return NULL;
 
-	s = capture_plugin_packet_new(SESSION_INFO_PDU_BASE_SIZE + username_length,
+	s = capture_plugin_packet_new(SESSION_INFO_PDU_BASE_SIZE + (UINT32)username_length,
 	                              MESSAGE_TYPE_SESSION_INFO);
 	if (!s)
 		return NULL;
 
-	Stream_Write_UINT16(s, username_length);                         /* username length (2 bytes) */
+	Stream_Write_UINT16(s, (UINT16)username_length);                 /* username length (2 bytes) */
 	Stream_Write(s, settings->Username, username_length);            /* username */
 	Stream_Write_UINT32(s, settings->DesktopWidth);                  /* desktop width (4 bytes) */
 	Stream_Write_UINT32(s, settings->DesktopHeight);                 /* desktop height (4 bytes) */
diff --git a/winpr/libwinpr/crypto/cipher.c b/winpr/libwinpr/crypto/cipher.c
index bb98489d7..677dfb115 100644
--- a/winpr/libwinpr/crypto/cipher.c
+++ b/winpr/libwinpr/crypto/cipher.c
@@ -813,6 +813,7 @@ err:
 	mbedtls_md_free(&ctx);
 	SecureZeroMemory(md_buf, 64);
 	return rv;
-#endif
+#else
 	return 0;
+#endif
 }
diff --git a/winpr/libwinpr/registry/registry_reg.c b/winpr/libwinpr/registry/registry_reg.c
index dc655e518..ec7685d2d 100644
--- a/winpr/libwinpr/registry/registry_reg.c
+++ b/winpr/libwinpr/registry/registry_reg.c
@@ -210,7 +210,8 @@ static RegVal* reg_load_value(const Reg* reg, RegKey* key)
 
 			value->data.dword = (DWORD)val;
 			}
-			break;
+		}
+		    break;
 			case REG_QWORD:
 			{
 				unsigned long long val;
@@ -257,7 +258,6 @@ static RegVal* reg_load_value(const Reg* reg, RegKey* key)
 				     reg_data_type_string(value->type));
 			break;
 		}
-	}
 
 	if (!key->values)
 	{