diff --git a/linphone/console/linphonec.c b/linphone/console/linphonec.c
index a859f2919..a3987d4da 100644
--- a/linphone/console/linphonec.c
+++ b/linphone/console/linphonec.c
@@ -341,12 +341,6 @@ static void *prompt_reader_thread(void *arg){
 		have_prompt=TRUE;
 		ms_mutex_unlock(&prompt_mutex);
 	}
-	/*
-	ms_mutex_lock(&prompt_mutex);
-	strcpy(received_prompt,"quit");
-	have_prompt=TRUE;
-	ms_mutex_unlock(&prompt_mutex);
-	*/
 	return NULL;
 }
 
diff --git a/linphone/gtk-glade/main.c b/linphone/gtk-glade/main.c
index 76df924df..f325ec8d7 100644
--- a/linphone/gtk-glade/main.c
+++ b/linphone/gtk-glade/main.c
@@ -674,13 +674,15 @@ static void linphone_gtk_init_main_window(){
 void linphone_gtk_close(){
 	/* couldn't find a way to prevent closing to destroy the main window*/
 	LinphoneCore *lc=linphone_gtk_get_core();
-	/*shutdown call if any*/
-	if (linphone_core_in_call(lc))
-		linphone_core_terminate_call(lc,NULL);
-	linphone_core_enable_video_preview(lc,FALSE);
 	the_ui=NULL;
 	the_ui=linphone_gtk_create_window("main");
 	linphone_gtk_init_main_window();
+	/*shutdown call if any*/
+	if (linphone_core_in_call(lc)){
+		linphone_core_terminate_call(lc,NULL);
+		linphone_gtk_call_terminated(the_ui);
+	}
+	linphone_core_enable_video_preview(lc,FALSE);
 }
 
 void linphone_gtk_log_handler(OrtpLogLevel lev, const char *fmt, va_list args){
diff --git a/linphone/mediastreamer2/configure.ac b/linphone/mediastreamer2/configure.ac
index 99d683aa8..405058638 100644
--- a/linphone/mediastreamer2/configure.ac
+++ b/linphone/mediastreamer2/configure.ac
@@ -132,6 +132,9 @@ esac
 
 AM_CONDITIONAL(BUILD_MACOSX, test x$macosx_found = xyes)
 
+dnl initialize pkg-config so that we can use it within if else fi statements.
+PKG_PROG_PKG_CONFIG()
+
 AC_SUBST(MSPLUGINS_CFLAGS)
 AC_SUBST(MSPLUGINS_LIBS)
 
@@ -188,8 +191,6 @@ AC_ARG_ENABLE(artsc,
 
 arts_enabled=false
 
-PKG_PROG_PKG_CONFIG()
-
 if test "$artsc" = "true" ; then
 
 	dnl check for arts (kde sound daemon) support
diff --git a/linphone/oRTP/src/ortp.c b/linphone/oRTP/src/ortp.c
index 2c11abf56..6a848fc88 100644
--- a/linphone/oRTP/src/ortp.c
+++ b/linphone/oRTP/src/ortp.c
@@ -52,10 +52,10 @@ static bool_t win32_init_sockets(void){
 	WSADATA wsaData;
 	int i;
 	
-	wVersionRequested = MAKEWORD(1,1);
+	wVersionRequested = MAKEWORD(2,0);
 	if( (i = WSAStartup(wVersionRequested,  &wsaData))!=0)
 	{
-		ortp_error("Unable to initialize windows socket api, reason: %d",i);
+		ortp_error("Unable to initialize windows socket api, reason: %d (%s)",i,getWinSocketError(i));
 		return FALSE;
 	}
 	return TRUE;