diff --git a/client/SDL/SDL2/sdl_freerdp.cpp b/client/SDL/SDL2/sdl_freerdp.cpp
index 3568d71bd..3a0fd1ee3 100644
--- a/client/SDL/SDL2/sdl_freerdp.cpp
+++ b/client/SDL/SDL2/sdl_freerdp.cpp
@@ -1395,9 +1395,6 @@ static DWORD WINAPI sdl_client_thread_proc(SdlContext* sdl)
 {
 	WINPR_ASSERT(sdl);
 
-	auto instance = sdl->context()->instance;
-	WINPR_ASSERT(instance);
-
 	std::string error_msg;
 	int exit_code = sdl_client_thread_connect(sdl, error_msg);
 	if (exit_code == SDL_EXIT_SUCCESS)
diff --git a/client/SDL/SDL2/sdl_pointer.cpp b/client/SDL/SDL2/sdl_pointer.cpp
index a296f2e36..5f00fdf33 100644
--- a/client/SDL/SDL2/sdl_pointer.cpp
+++ b/client/SDL/SDL2/sdl_pointer.cpp
@@ -178,8 +178,8 @@ static BOOL sdl_Pointer_SetNull(rdpContext* context)
 
 static BOOL sdl_Pointer_SetPosition(rdpContext* context, UINT32 x, UINT32 y)
 {
-	auto sdl = get_context(context);
-	WINPR_ASSERT(sdl);
+	WINPR_UNUSED(context);
+	WINPR_ASSERT(context);
 
 	return sdl_push_user_event(SDL_USEREVENT_POINTER_POSITION, x, y);
 }
diff --git a/client/SDL/SDL3/sdl_freerdp.cpp b/client/SDL/SDL3/sdl_freerdp.cpp
index 76611518c..0c93e28b3 100644
--- a/client/SDL/SDL3/sdl_freerdp.cpp
+++ b/client/SDL/SDL3/sdl_freerdp.cpp
@@ -1379,9 +1379,6 @@ static DWORD WINAPI sdl_client_thread_proc(SdlContext* sdl)
 {
 	WINPR_ASSERT(sdl);
 
-	auto instance = sdl->context()->instance;
-	WINPR_ASSERT(instance);
-
 	std::string error_msg;
 	int exit_code = sdl_client_thread_connect(sdl, error_msg);
 	if (exit_code == SDL_EXIT_SUCCESS)
diff --git a/client/SDL/SDL3/sdl_pointer.cpp b/client/SDL/SDL3/sdl_pointer.cpp
index 449fe1301..5c3aca1e0 100644
--- a/client/SDL/SDL3/sdl_pointer.cpp
+++ b/client/SDL/SDL3/sdl_pointer.cpp
@@ -176,8 +176,8 @@ static BOOL sdl_Pointer_SetNull(rdpContext* context)
 
 static BOOL sdl_Pointer_SetPosition(rdpContext* context, UINT32 x, UINT32 y)
 {
-	auto sdl = get_context(context);
-	WINPR_ASSERT(sdl);
+	WINPR_UNUSED(context);
+	WINPR_ASSERT(context);
 
 	return sdl_push_user_event(SDL_EVENT_USER_POINTER_POSITION, x, y);
 }
diff --git a/libfreerdp/codec/dsp.c b/libfreerdp/codec/dsp.c
index 26e44f4cf..c3f3c100b 100644
--- a/libfreerdp/codec/dsp.c
+++ b/libfreerdp/codec/dsp.c
@@ -1183,6 +1183,9 @@ fail:
 
 void freerdp_dsp_context_free(FREERDP_DSP_CONTEXT* context)
 {
+	if (!context)
+		return;
+
 #if defined(WITH_FDK_AAC)
 	FREERDP_DSP_COMMON_CONTEXT* ctx = (FREERDP_DSP_COMMON_CONTEXT*)context;
 	WINPR_ASSERT(ctx);
@@ -1193,9 +1196,7 @@ void freerdp_dsp_context_free(FREERDP_DSP_CONTEXT* context)
 	freerdp_dsp_ffmpeg_context_free(context);
 #else
 
-	if (context)
-	{
-		freerdp_dsp_common_context_uninit(&context->common);
+	freerdp_dsp_common_context_uninit(&context->common);
 
 #if defined(WITH_GSM)
 		gsm_destroy(context->gsm);
@@ -1231,8 +1232,7 @@ void freerdp_dsp_context_free(FREERDP_DSP_CONTEXT* context)
 #if defined(WITH_SOXR)
 		soxr_delete(context->sox);
 #endif
-		free(context);
-	}
+	    free(context);
 
 #endif
 }
diff --git a/libfreerdp/core/rdstls.c b/libfreerdp/core/rdstls.c
index 32335f56d..5384a1e1e 100644
--- a/libfreerdp/core/rdstls.c
+++ b/libfreerdp/core/rdstls.c
@@ -440,6 +440,8 @@ static BOOL rdstls_cmp_str(wLog* log, const char* field, const char* serverStr,
 			return FALSE;
 		}
 
+		WINPR_ASSERT(serverStr);
+		WINPR_ASSERT(clientStr);
 		if (strcmp(serverStr, clientStr) != 0)
 		{
 			WLog_Print(log, WLOG_ERROR, "%s verification failed", field);
diff --git a/server/proxy/modules/demo/demo.cpp b/server/proxy/modules/demo/demo.cpp
index 3edde5c26..8cfff27dc 100644
--- a/server/proxy/modules/demo/demo.cpp
+++ b/server/proxy/modules/demo/demo.cpp
@@ -247,7 +247,7 @@ static BOOL demo_mouse_event(proxyPlugin* plugin, proxyData* pdata, void* param)
 	WINPR_ASSERT(pdata);
 	WINPR_ASSERT(event_data);
 
-	WLog_INFO(TAG, "called");
+	WLog_INFO(TAG, "called %p", event_data);
 	return TRUE;
 }
 
@@ -259,7 +259,7 @@ static BOOL demo_mouse_ex_event(proxyPlugin* plugin, proxyData* pdata, void* par
 	WINPR_ASSERT(pdata);
 	WINPR_ASSERT(event_data);
 
-	WLog_INFO(TAG, "called");
+	WLog_INFO(TAG, "called %p", event_data);
 	return TRUE;
 }
 
@@ -309,7 +309,7 @@ static BOOL demo_server_fetch_target_addr(proxyPlugin* plugin, proxyData* pdata,
 	WINPR_ASSERT(pdata);
 	WINPR_ASSERT(event_data);
 
-	WLog_INFO(TAG, "called");
+	WLog_INFO(TAG, "called %p", event_data);
 	return TRUE;
 }
 
@@ -333,7 +333,7 @@ static BOOL demo_dyn_channel_intercept_list(proxyPlugin* plugin, proxyData* pdat
 	WINPR_ASSERT(pdata);
 	WINPR_ASSERT(data);
 
-	WLog_INFO(TAG, "%s", __func__);
+	WLog_INFO(TAG, "%s: %p", __func__, data);
 	return TRUE;
 }
 
@@ -345,7 +345,7 @@ static BOOL demo_static_channel_intercept_list(proxyPlugin* plugin, proxyData* p
 	WINPR_ASSERT(pdata);
 	WINPR_ASSERT(data);
 
-	WLog_INFO(TAG, "%s", __func__);
+	WLog_INFO(TAG, "%s: %p", __func__, data);
 	return TRUE;
 }
 
@@ -357,7 +357,7 @@ static BOOL demo_dyn_channel_intercept(proxyPlugin* plugin, proxyData* pdata, vo
 	WINPR_ASSERT(pdata);
 	WINPR_ASSERT(data);
 
-	WLog_INFO(TAG, "%s", __func__);
+	WLog_INFO(TAG, "%s: %p", __func__, data);
 	return TRUE;
 }