diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index dbc39f58a..d5bbe3e47 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -320,11 +320,8 @@ static void linphone_proxy_config_register(LinphoneProxyConfig *obj){
 	if (obj->reg_sendregister){
 		LinphoneAddress* proxy=linphone_address_new(obj->reg_proxy);
 		char* proxy_string;
-#ifndef USE_BELLESIP
-		char *contact;
-#else
 		LinphoneAddress *contact;
-#endif
+
 		proxy_string=linphone_address_as_string_uri_only(proxy);
 		linphone_address_destroy(proxy);
 		if (obj->op)
@@ -332,11 +329,7 @@ static void linphone_proxy_config_register(LinphoneProxyConfig *obj){
 		obj->op=sal_op_new(obj->lc->sal);
 		if ((contact=guess_contact_for_register(obj))) {
 			sal_op_set_contact(obj->op,contact);
-#ifndef USE_BELLESIP
-			ms_free(contact);
-#else
 			linphone_address_destroy(contact);
-#endif
 		}
 		sal_op_set_user_pointer(obj->op,obj);
 		if (sal_register(obj->op,proxy_string,obj->reg_identity,obj->expires)==0) {
diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c
index 1df32f237..910cb43b3 100644
--- a/tester/liblinphone_tester.c
+++ b/tester/liblinphone_tester.c
@@ -137,7 +137,7 @@ bool_t wait_for_until(LinphoneCore* lc_1, LinphoneCore* lc_2,int* counter,int va
 	return result;
 }
 bool_t wait_for(LinphoneCore* lc_1, LinphoneCore* lc_2,int* counter,int value) {
-	return wait_for_until(lc_1, lc_2,counter,value,2000);
+	return wait_for_until(lc_1, lc_2,counter,value,3000);
 }
 bool_t wait_for_list(MSList* lcs,int* counter,int value,int timeout_ms) {
 	int retry=0;
diff --git a/tester/register_tester.c b/tester/register_tester.c
index 9531c1447..6ee79f9cd 100644
--- a/tester/register_tester.c
+++ b/tester/register_tester.c
@@ -481,7 +481,7 @@ static void io_recv_error_late_recovery(){
 	sal_set_recv_error(lc->sal, 1); /*reset*/
 	sal_set_send_error(lc->sal, 0);
 
-	CU_ASSERT_TRUE(wait_for_list(lcs=ms_list_append(NULL,lc),&counters->number_of_LinphoneRegistrationOk,register_ok-number_of_udp_proxy +register_ok,sal_get_refresher_retry_after(lc->sal)+1000));
+	CU_ASSERT_TRUE(wait_for_list(lcs=ms_list_append(NULL,lc),&counters->number_of_LinphoneRegistrationOk,register_ok-number_of_udp_proxy +register_ok,sal_get_refresher_retry_after(lc->sal)+3000));
 
 	linphone_core_manager_destroy(mgr);
 }