diff --git a/server/cursor-channel.c b/server/cursor-channel.c
index 9d722996..840ff304 100644
--- a/server/cursor-channel.c
+++ b/server/cursor-channel.c
@@ -427,7 +427,7 @@ static void cursor_channel_release_item(RedChannelClient *rcc, PipeItem *item, i
 CursorChannel* cursor_channel_new(RedWorker *worker)
 {
     CursorChannel *cursor_channel;
-    RedChannel *channel = NULL;
+    CommonChannel *channel = NULL;
     ChannelCbs cbs = {
         .on_disconnect =  cursor_channel_client_on_disconnect,
         .send_item = cursor_channel_send_item,
diff --git a/server/red_worker.c b/server/red_worker.c
index d501e2e6..fd729928 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -638,7 +638,7 @@ CommonChannelClient *common_channel_new_client(CommonChannel *common,
 }
 
 
-RedChannel *red_worker_new_channel(RedWorker *worker, int size,
+CommonChannel *red_worker_new_channel(RedWorker *worker, int size,
                                    const char *name,
                                    uint32_t channel_type, int migration_flags,
                                    ChannelCbs *channel_cbs,
@@ -669,7 +669,7 @@ RedChannel *red_worker_new_channel(RedWorker *worker, int size,
 
     common = (CommonChannel *)channel;
     common->worker = worker;
-    return channel;
+    return common;
 }
 
 static void guest_set_client_capabilities(RedWorker *worker)
diff --git a/server/red_worker.h b/server/red_worker.h
index a76c805e..755f0c3a 100644
--- a/server/red_worker.h
+++ b/server/red_worker.h
@@ -106,7 +106,7 @@ RedMemSlotInfo* red_worker_get_memslot(RedWorker *worker);
 void red_drawable_unref(RedWorker *worker, RedDrawable *red_drawable,
                         uint32_t group_id);
 
-RedChannel *red_worker_new_channel(RedWorker *worker, int size,
+CommonChannel *red_worker_new_channel(RedWorker *worker, int size,
                                    const char *name,
                                    uint32_t channel_type, int migration_flags,
                                    ChannelCbs *channel_cbs,