diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index bda799e9..339a85f5 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -290,7 +290,7 @@ public abstract class ExchangeSession {
      * @return true if basic authentication detected
      * @throws IOException unable to connect to exchange
      */
-    protected boolean isBasicAuthentication(HttpClient httpClient, String url) throws IOException {
+    protected boolean isBasicAuthentication(HttpClient httpClient, String url)  {
         return DavGatewayHttpClientFacade.getHttpStatus(httpClient, url) == HttpStatus.SC_UNAUTHORIZED;
     }
 
@@ -1415,15 +1415,6 @@ public abstract class ExchangeSession {
          */
         public int recent;
 
-        /**
-         * Calendar color
-         */
-        public String calendarColor;
-        /**
-         * Calendar order
-         */
-        public String calendarOrder;
-
         /**
          * Folder message list, empty before loadMessages call.
          */
@@ -2545,7 +2536,7 @@ public abstract class ExchangeSession {
 
     protected abstract Condition getCalendarItemCondition(boolean excludeTasks, Condition dateCondition);
 
-    protected Condition getPastDelayCondition() throws IOException {
+    protected Condition getPastDelayCondition()  {
          int caldavPastDelay = Settings.getIntProperty("davmail.caldavPastDelay");
         Condition dateCondition = null;
         if (caldavPastDelay != 0) {
diff --git a/src/java/davmail/exchange/dav/DavExchangeSession.java b/src/java/davmail/exchange/dav/DavExchangeSession.java
index 4b59eb18..bb191609 100644
--- a/src/java/davmail/exchange/dav/DavExchangeSession.java
+++ b/src/java/davmail/exchange/dav/DavExchangeSession.java
@@ -2915,7 +2915,7 @@ public class DavExchangeSession extends ExchangeSession {
         priorityToImportanceMap.put("9", "low");
     }
 
-    protected String convertPriorityFromExchange(String exchangeImportanceValue) throws DavMailException {
+    protected String convertPriorityFromExchange(String exchangeImportanceValue)  {
         String value = null;
         if (exchangeImportanceValue != null) {
             value = importanceToPriorityMap.get(exchangeImportanceValue);
@@ -2923,7 +2923,7 @@ public class DavExchangeSession extends ExchangeSession {
         return value;
     }
 
-    protected String convertPriorityToExchange(String vTodoPriorityValue) throws DavMailException {
+    protected String convertPriorityToExchange(String vTodoPriorityValue)  {
         String value = null;
         if (vTodoPriorityValue != null) {
             value = priorityToImportanceMap.get(vTodoPriorityValue);
diff --git a/src/java/davmail/exchange/dav/ExchangePropPatchMethod.java b/src/java/davmail/exchange/dav/ExchangePropPatchMethod.java
index 5fc5789b..cd24ef6b 100644
--- a/src/java/davmail/exchange/dav/ExchangePropPatchMethod.java
+++ b/src/java/davmail/exchange/dav/ExchangePropPatchMethod.java
@@ -262,19 +262,6 @@ public class ExchangePropPatchMethod extends PostMethod {
         }
     }
 
-    /**
-     * Get Multistatus responses.
-     *
-     * @return responses
-     * @throws HttpException on error
-     */
-    public List<MultiStatusResponse> getResponses() throws HttpException {
-        if (responses == null) {
-            throw new HttpException(getStatusLine().toString());
-        }
-        return responses;
-    }
-
     /**
      * Get single Multistatus response.
      *
diff --git a/src/java/davmail/exchange/ews/EwsExchangeSession.java b/src/java/davmail/exchange/ews/EwsExchangeSession.java
index ddf010da..4d0dbe90 100644
--- a/src/java/davmail/exchange/ews/EwsExchangeSession.java
+++ b/src/java/davmail/exchange/ews/EwsExchangeSession.java
@@ -1184,7 +1184,7 @@ public class EwsExchangeSession extends ExchangeSession {
         String type;
         boolean isException;
 
-        protected Event(EWSMethod.Item response) throws URIException {
+        protected Event(EWSMethod.Item response)  {
             itemId = new ItemId(response);
 
             type = response.type;
@@ -2003,9 +2003,10 @@ public class EwsExchangeSession extends ExchangeSession {
         contact.put("imapUid", response.get("Name"));
         contact.put("uid", response.get("Name"));
         if (LOGGER.isDebugEnabled()) {
-            for (String key : response.keySet()) {
+            for (Map.Entry<String, String> entry : response.entrySet()) {
+                String key = entry.getKey();
                 if (!IGNORE_ATTRIBUTE_SET.contains(key) && !GALFIND_ATTRIBUTE_MAP.containsValue(key)) {
-                    LOGGER.debug("Unsupported ResolveNames " + contact.getName() + " response attribute: " + key + " value: " + response.get(key));
+                    LOGGER.debug("Unsupported ResolveNames " + contact.getName() + " response attribute: " + key + " value: " + entry.getValue());
                 }
             }
         }
@@ -2161,7 +2162,7 @@ public class EwsExchangeSession extends ExchangeSession {
     }
 
     protected static boolean isItemId(String itemName) {
-        return itemName.length() == 156 || itemName.length() == 152;
+        return itemName.length() >= 152;
     }
 }
 
diff --git a/src/java/davmail/ui/SelectCertificateDialog.java b/src/java/davmail/ui/SelectCertificateDialog.java
index 38301314..6cec5151 100644
--- a/src/java/davmail/ui/SelectCertificateDialog.java
+++ b/src/java/davmail/ui/SelectCertificateDialog.java
@@ -30,7 +30,7 @@ import java.awt.event.ActionListener;
  * Let user select a client certificate
  */
 public class SelectCertificateDialog extends JDialog {
-    protected JList aliasListBox;
+    protected final JList aliasListBox;
     protected String selectedAlias;
 
     /**