diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
index 8f4e14bdc..bbc78a2fb 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
@@ -1578,7 +1578,7 @@ else if (ev instanceof PropertyChangeEvent)
                 PropertyChangeEvent pcev = (PropertyChangeEvent) ev;
 
                 tryStopCallTimer
-                    = (CallConference.CALLS.equals(pcev)
+                    = (CallConference.CALLS.equals(pcev.getPropertyName())
                             && (pcev.getOldValue() instanceof Call)
                             && (pcev.getNewValue() == null));
             }
diff --git a/src/net/java/sip/communicator/impl/gui/utils/PluginContainer.java b/src/net/java/sip/communicator/impl/gui/utils/PluginContainer.java
index 815690545..7b3d8669c 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/PluginContainer.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/PluginContainer.java
@@ -111,7 +111,7 @@ protected void addComponentToContainer(
     private synchronized void addPluginComponent(PluginComponent c)
     {
         if (logger.isInfoEnabled())
-            logger.info("Will add following plugin component: " + c);
+            logger.info("Will add plugin component: " + c);
 
         /*
          * Try to respect positionIndex of PluginComponent to some extent:
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java
index 3c98bd927..73f25655d 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java
@@ -18,7 +18,6 @@
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smackx.packet.*;
-// disambiguation
 
 /**
  * The Jabber implementation of a Persistent Presence Operation set. This class
@@ -1454,7 +1453,7 @@ public void parseContactPhotoPresence(Packet packet)
                     defaultPacketExtension.getValue("photo");
                 // If this presence packet has a photo tag with a SHA-1 hash
                 // which differs from the current avatar SHA-1 hash, then Jitsi
-                // retreives the new avatar image and updates this contact image
+                // retrieves the new avatar image and updates this contact image
                 // in the contact list.
                 if(packetPhotoSHA1 != null
                         && !packetPhotoSHA1.equals(
@@ -1464,7 +1463,7 @@ public void parseContactPhotoPresence(Packet packet)
                 {
                     byte[] newAvatar = null;
 
-                    // If there is an avatar image, retreives it. 
+                    // If there is an avatar image, retrieves it. 
                     if(packetPhotoSHA1.length() != 0)
                     {
                         // Retrieves the new contact avatar image.
@@ -1491,7 +1490,7 @@ public void parseContactPhotoPresence(Packet packet)
             }
             catch(XMPPException ex)
             {
-                logger.info("Can not retrieve vCard from: " + packet.getFrom());
+                logger.info("Cannot retrieve vCard from: " + packet.getFrom());
                 if(logger.isTraceEnabled())
                     logger.trace("vCard retrieval exception was: ", ex);
             }