diff --git a/app/src/main/java/org/linphone/LinphoneManager.java b/app/src/main/java/org/linphone/LinphoneManager.java
index fd5c49ca3..7161c49e9 100644
--- a/app/src/main/java/org/linphone/LinphoneManager.java
+++ b/app/src/main/java/org/linphone/LinphoneManager.java
@@ -356,6 +356,7 @@ public class LinphoneManager implements SensorEventListener {
     }
 
     public void restartCore() {
+        Log.w("[Manager] Restarting Core");
         mCore.stop();
         mCore.start();
     }
@@ -363,8 +364,8 @@ public class LinphoneManager implements SensorEventListener {
     private void destroyCore() {
         Log.w("[Manager] Destroying Core");
         if (LinphonePreferences.instance() != null) {
-            // We set network reachable at false before destroy LC to not send register with expires
-            // at 0
+            // We set network reachable at false before destroying the Core
+            // to not send a register with expires at 0
             if (LinphonePreferences.instance().isPushNotificationEnabled()) {
                 Log.w(
                         "[Manager] Setting network reachability to False to prevent unregister and allow incoming push notifications");
diff --git a/app/src/main/java/org/linphone/call/CallStatsFragment.java b/app/src/main/java/org/linphone/call/CallStatsFragment.java
index d088baf71..504a99e87 100644
--- a/app/src/main/java/org/linphone/call/CallStatsFragment.java
+++ b/app/src/main/java/org/linphone/call/CallStatsFragment.java
@@ -55,8 +55,8 @@ public class CallStatsFragment extends Fragment {
                 new CoreListenerStub() {
                     @Override
                     public void onCallStateChanged(
-                            Core lc, Call call, Call.State cstate, String message) {
-                        if (cstate == Call.State.End || cstate == Call.State.Error) {
+                            Core core, Call call, Call.State state, String message) {
+                        if (state == Call.State.End || state == Call.State.Error) {
                             mAdapter.updateListItems(
                                     Arrays.asList(LinphoneManager.getCore().getCalls()));
                         }
diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
index 11abad297..ad3885033 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
@@ -349,7 +349,7 @@ public class ChatMessagesFragment extends Fragment
                 new CoreListenerStub() {
                     @Override
                     public void onCallStateChanged(
-                            Core lc, Call call, Call.State state, String message) {
+                            Core core, Call call, Call.State state, String message) {
                         displayChatRoomHeader();
                     }
                 };
diff --git a/app/src/main/java/org/linphone/contacts/LinphoneContact.java b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
index e1d86e244..b1e91479c 100644
--- a/app/src/main/java/org/linphone/contacts/LinphoneContact.java
+++ b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
@@ -33,7 +33,6 @@ import org.linphone.core.Address;
 import org.linphone.core.Core;
 import org.linphone.core.Friend;
 import org.linphone.core.FriendCapability;
-import org.linphone.core.FriendList;
 import org.linphone.core.PresenceBasicStatus;
 import org.linphone.core.PresenceModel;
 import org.linphone.core.SubscribePolicy;