diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 899c185f2..3102a2613 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -35,7 +35,7 @@ dtmf_player_amp=0.1
 ec_calibrator_cool_tones=1
 
 [misc]
-conference_factory_uri=sip:conference-factory@conf.test.org
+conference_factory_uri=sip:conference-factory@conf.linphone.org
 max_calls=10
 history_max_size=100
 
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index 611278b97..555339bc6 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -64,7 +64,6 @@ import org.linphone.core.Core;
 import org.linphone.core.EventLog;
 import org.linphone.core.Factory;
 import org.linphone.core.Participant;
-import org.linphone.mediastream.Log;
 import org.linphone.receivers.ContactsUpdatedListener;
 
 import java.io.File;
diff --git a/src/android/org/linphone/chat/GroupInfoFragment.java b/src/android/org/linphone/chat/GroupInfoFragment.java
index bc07be819..cc40d153a 100644
--- a/src/android/org/linphone/chat/GroupInfoFragment.java
+++ b/src/android/org/linphone/chat/GroupInfoFragment.java
@@ -39,7 +39,6 @@ import org.linphone.contacts.ContactAddress;
 import org.linphone.core.Address;
 import org.linphone.core.ChatRoom;
 import org.linphone.core.ChatRoomListenerStub;
-import org.linphone.core.Participant;
 import org.linphone.mediastream.Log;
 
 import java.util.ArrayList;