diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt
index e13727640..d9eb7faa7 100644
--- a/channels/CMakeLists.txt
+++ b/channels/CMakeLists.txt
@@ -118,7 +118,6 @@ macro(add_channel_client_subsystem _channel_prefix _channel_name _subsystem _typ
 	set(_channel_module_name "${_channel_name}-client")
 	string(TOUPPER "CHANNEL_${_channel_name}_CLIENT_${_subsystem}" _subsystem_prefix)
 	if(${${_subsystem_prefix}_STATIC})
-		message(STATUS "Static Subsystem: ${_subsystem_prefix} / ${_subsystem}")
 		get_target_property(CHANNEL_SUBSYSTEMS ${_channel_module_name} SUBSYSTEMS)
 		set(SUBSYSTEMS ${SUBSYSTEMS} ${_subsystem})
 		set_target_properties(${_channel_module_name} PROPERTIES SUBSYSTEMS "${SUBSYSTEMS}")
diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt
index 21b311747..fb633c387 100644
--- a/channels/client/CMakeLists.txt
+++ b/channels/client/CMakeLists.txt
@@ -63,7 +63,6 @@ foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})
 		set(CHANNEL_SUBSYSTEMS "")
 	endif()
 	foreach(STATIC_SUBSYSTEM ${CHANNEL_SUBSYSTEMS})
-		message(STATUS "STATIC_SUBSYSTEM: ${STATIC_SUBSYSTEM}")
 		string(TOUPPER "${STATIC_MODULE}_CLIENT_${STATIC_SUBSYSTEM}" SUBSYSTEM_PREFIX)
 		set(SUBSYSTEM_MODULE_NAME "${STATIC_MODULE_NAME}-${STATIC_SUBSYSTEM}")
 		set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${SUBSYSTEM_MODULE_NAME})
diff --git a/channels/client/channels.c b/channels/client/channels.c
index c112b372e..c43e5fd9c 100644
--- a/channels/client/channels.c
+++ b/channels/client/channels.c
@@ -1166,7 +1166,7 @@ int freerdp_channels_load_plugin(rdpChannels* channels, rdpSettings* settings, c
 {
 	void* entry;
 
-	DEBUG_CHANNELS("%s", Name);
+	DEBUG_CHANNELS("%s", name);
 
 	entry = (PVIRTUALCHANNELENTRY) freerdp_load_plugin(name, CHANNEL_EXPORT_FUNC_NAME);
 
@@ -1244,7 +1244,7 @@ int freerdp_channels_post_connect(rdpChannels* channels, freerdp* instance)
 	hostname = instance->settings->ServerHostname;
 	hostname_len = strlen(hostname);
 
-	DEBUG_CHANNELS("hostname [%s] channels->num_libs [%d]", Hostname, channels->num_libs_data);
+	DEBUG_CHANNELS("hostname [%s] channels->num_libs [%d]", hostname, channels->num_libs_data);
 
 	for (index = 0; index < channels->num_libs_data; index++)
 	{
@@ -1335,7 +1335,7 @@ FREERDP_API int freerdp_channels_send_event(rdpChannels* channels, RDP_EVENT* ev
 
 	if (lchannel_data == NULL)
 	{
-		DEBUG_CHANNELS("could not find channel name %s", Name);
+		DEBUG_CHANNELS("could not find channel name %s", name);
 		freerdp_event_free(event);
 		return 1;
 	}
diff --git a/channels/server/channels.c b/channels/server/channels.c
index 39666a552..09105132c 100644
--- a/channels/server/channels.c
+++ b/channels/server/channels.c
@@ -174,12 +174,12 @@ static void wts_read_drdynvc_create_response(rdpPeerChannel* channel, STREAM* s,
 
 	if ((INT32) CreationStatus < 0)
 	{
-		DEBUG_DVC("ChannelId %d creation failed (%d)", channel->ChannelId, (INT32)CreationStatus);
+		DEBUG_DVC("ChannelId %d creation failed (%d)", channel->channel_id, (INT32) CreationStatus);
 		channel->dvc_open_state = DVC_OPEN_STATE_FAILED;
 	}
 	else
 	{
-		DEBUG_DVC("ChannelId %d creation succeeded", channel->ChannelId);
+		DEBUG_DVC("ChannelId %d creation succeeded", channel->channel_id);
 		channel->dvc_open_state = DVC_OPEN_STATE_SUCCEEDED;
 	}
 	wait_obj_set(channel->receive_event);
@@ -231,7 +231,7 @@ static void wts_read_drdynvc_data(rdpPeerChannel* channel, STREAM* s, UINT32 len
 
 static void wts_read_drdynvc_close_response(rdpPeerChannel* channel)
 {
-	DEBUG_DVC("ChannelId %d close response", channel->ChannelId);
+	DEBUG_DVC("ChannelId %d close response", channel->channel_id);
 	channel->dvc_open_state = DVC_OPEN_STATE_CLOSED;
 }
 
@@ -554,7 +554,7 @@ void* WTSVirtualChannelOpenEx(
 		WTSVirtualChannelWrite(vcm->drdynvc_channel, stream_get_head(s), stream_get_length(s), NULL);
 		stream_free(s);
 
-		DEBUG_DVC("ChannelId %d.%s (total %d)", channel->ChannelId, pVirtualName, list_size(vcm->dvc_channel_list));
+		DEBUG_DVC("ChannelId %d.%s (total %d)", channel->channel_id, pVirtualName, list_size(vcm->dvc_channel_list));
 	}
 	else
 	{