diff --git a/coreapi/bellesip_sal/sal_op_impl.c b/coreapi/bellesip_sal/sal_op_impl.c
index addb47ea9..5acfd5eae 100644
--- a/coreapi/bellesip_sal/sal_op_impl.c
+++ b/coreapi/bellesip_sal/sal_op_impl.c
@@ -311,10 +311,12 @@ static int _sal_op_send_request_with_contact(SalOp* op, belle_sip_request_t* req
 				}
 			}
 		}else{
+#ifdef TUNNEL_ENABLED
 			if (BELLE_SIP_OBJECT_IS_INSTANCE_OF(udplp,belle_sip_tunnel_listening_point_t)){
 				/* our tunnel mode only supports UDP. Force transport to be set to UDP */
 				belle_sip_uri_set_transport_param(next_hop_uri,"udp");
 			}
+#endif
 		}
 		if ((strcmp(method,"REGISTER")==0 || strcmp(method,"SUBSCRIBE")==0) && transport &&
 			(strcasecmp(transport,"TCP")==0 || strcasecmp(transport,"TLS")==0)){
diff --git a/gtk/videowindow.c b/gtk/videowindow.c
index 24dc584f7..f2247e573 100644
--- a/gtk/videowindow.c
+++ b/gtk/videowindow.c
@@ -74,7 +74,7 @@ static void drag_data_received(GtkWidget *widget, GdkDragContext *context, gint
 }
 
 static gboolean drag_drop(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, guint time, gpointer user_data){
-#if GTK_CHECK_VERSION(2,20,0)
+#if GTK_CHECK_VERSION(2,21,0)
 	GList *l=gdk_drag_context_list_targets(drag_context);
 	GList *elem;