diff --git a/channels/tsmf/client/CMakeLists.txt b/channels/tsmf/client/CMakeLists.txt
index 1e0751993..8febf15c8 100644
--- a/channels/tsmf/client/CMakeLists.txt
+++ b/channels/tsmf/client/CMakeLists.txt
@@ -57,7 +57,7 @@ if(WITH_GSTREAMER_0_10 OR WITH_GSTREAMER_1_0)
 	find_feature(XRandR ${XRANDR_FEATURE_TYPE} ${XRANDR_FEATURE_PURPOSE} ${XRANDR_FEATURE_DESCRIPTION})
 	if (WITH_XRANDR)
 		add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "gstreamer" "decoder")
-  else()
+	else()
 		message(WARNING "Disabling tsmf gstreamer because XRandR wasn't found")
 	endif()
 endif()
diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
index e40f44d83..657ac29c7 100644
--- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
@@ -508,7 +508,7 @@ static void tsmf_ffmpeg_free(ITSMFDecoder *decoder)
 static BOOL initialized = FALSE;
 
 #ifdef STATIC_CHANNELS
-#define freerdp_tsmf_client_subsystem_entry	ffmpeg_freerdp_tsmf_client_subsystem_entry
+#define freerdp_tsmf_client_subsystem_entry	ffmpeg_freerdp_tsmf_client_decoder_subsystem_entry
 #endif
 
 ITSMFDecoder *freerdp_tsmf_client_subsystem_entry(void)
diff --git a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c
index bd533e73c..0139b8996 100644
--- a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c
+++ b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c
@@ -748,7 +748,7 @@ BOOL tsmf_gstreamer_sync(ITSMFDecoder *decoder, void (*cb)(void *), void *stream
 }
 
 #ifdef STATIC_CHANNELS
-#define freerdp_tsmf_client_subsystem_entry	gstreamer_freerdp_tsmf_client_subsystem_entry
+#define freerdp_tsmf_client_subsystem_entry	gstreamer_freerdp_tsmf_client_decoder_subsystem_entry
 #endif
 
 ITSMFDecoder *freerdp_tsmf_client_subsystem_entry(void)
diff --git a/libfreerdp/gdi/gdi.c b/libfreerdp/gdi/gdi.c
index c3093c487..f44810427 100644
--- a/libfreerdp/gdi/gdi.c
+++ b/libfreerdp/gdi/gdi.c
@@ -591,7 +591,6 @@ void gdi_bitmap_update(rdpContext* context, BITMAP_UPDATE* bitmapUpdate)
 void gdi_palette_update(rdpContext* context, PALETTE_UPDATE* palette)
 {
 	int index;
-	BYTE r, g, b;
 	PALETTE_ENTRY* pe;
 	UINT32* palette32;
 	rdpGdi* gdi = context->gdi;
diff --git a/server/shadow/X11/x11_shadow.c b/server/shadow/X11/x11_shadow.c
index 6594e7156..75cf18e00 100644
--- a/server/shadow/X11/x11_shadow.c
+++ b/server/shadow/X11/x11_shadow.c
@@ -230,7 +230,7 @@ int x11_shadow_screen_grab(x11ShadowSubsystem* subsystem)
 			freerdp_image_copy(surface->data, PIXEL_FORMAT_XRGB32,
 					surface->scanline, x - surface->x, y - surface->y, width, height,
 					(BYTE*) image->data, PIXEL_FORMAT_XRGB32,
-					image->bytes_per_line, x, y);
+					image->bytes_per_line, x, y, NULL);
 
 			region16_union_rect(&(subsystem->invalidRegion), &(subsystem->invalidRegion), &invalidRect);
 
@@ -271,7 +271,7 @@ int x11_shadow_screen_grab(x11ShadowSubsystem* subsystem)
 			freerdp_image_copy(surface->data, PIXEL_FORMAT_XRGB32,
 					surface->scanline, x - surface->x, y - surface->y, width, height,
 					(BYTE*) image->data, PIXEL_FORMAT_XRGB32,
-					image->bytes_per_line, x, y);
+					image->bytes_per_line, x, y, NULL);
 
 			region16_union_rect(&(subsystem->invalidRegion), &(subsystem->invalidRegion), &invalidRect);
 
diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c
index 42b17176d..f614a0c9e 100644
--- a/server/shadow/shadow_client.c
+++ b/server/shadow/shadow_client.c
@@ -489,7 +489,7 @@ int shadow_client_send_bitmap_update(rdpShadowClient* client, rdpShadowSurface*
 					buffer = encoder->grid[k];
 
 					freerdp_image_copy(buffer, dstFormat, -1, 0, 0, nWidth, nHeight,
-							data, srcFormat, nSrcStep, 0, 0);
+							data, srcFormat, nSrcStep, 0, 0, NULL);
 
 					lines = freerdp_bitmap_compress((char*) buffer, nWidth, nHeight, s,
 							settings->ColorDepth, 64 * 64 * 4, nHeight - 1, ts, e);