diff --git a/core/src/main/java/org/jivesoftware/spark/component/CheckBoxList.java b/core/src/main/java/org/jivesoftware/spark/component/CheckBoxList.java
index fd04c62eb..ff9035b81 100644
--- a/core/src/main/java/org/jivesoftware/spark/component/CheckBoxList.java
+++ b/core/src/main/java/org/jivesoftware/spark/component/CheckBoxList.java
@@ -61,9 +61,10 @@ public class CheckBoxList extends JPanel {
      */
     public List<String> getSelectedValues() {
         List<String> list = new ArrayList<>();
-        for (JCheckBox checkbox : valueMap.keySet()) {
+        for (var e : valueMap.entrySet()) {
+            JCheckBox checkbox = e.getKey();
             if (checkbox.isSelected()) {
-                String value = valueMap.get(checkbox);
+                String value = e.getValue();
                 list.add(value);
             }
         }
diff --git a/core/src/main/java/org/jivesoftware/spark/component/RosterTree.java b/core/src/main/java/org/jivesoftware/spark/component/RosterTree.java
index 3197b6c28..684f615c5 100644
--- a/core/src/main/java/org/jivesoftware/spark/component/RosterTree.java
+++ b/core/src/main/java/org/jivesoftware/spark/component/RosterTree.java
@@ -70,8 +70,9 @@ public final class RosterTree extends JPanel {
     }
 
     private void changePresence(String user, Presence presence){
-        for (JiveTreeNode node : addressMap.keySet()) {
-            final String nodeUser = addressMap.get(node);
+        for (var e : addressMap.entrySet()) {
+            JiveTreeNode node = e.getKey();
+            final String nodeUser = e.getValue();
             if (user.startsWith(nodeUser)) {
                 if (!presence.isAvailable()) {
                     node.setIcon(SparkRes.getImageIcon(SparkRes.Icon.CLEAR_BALL_ICON));
diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/packet/GatewayPrivateData.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/packet/GatewayPrivateData.java
index e704cbdec..568d0e69c 100644
--- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/packet/GatewayPrivateData.java
+++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/packet/GatewayPrivateData.java
@@ -69,9 +69,10 @@ public class GatewayPrivateData implements PrivateData {
         StringBuilder buf = new StringBuilder();
         buf.append("<").append(getElementName()).append(" xmlns=\"").append(getNamespace()).append("\">");
         buf.append("<gateways>");
-        for (DomainBareJid serviceName : loginSettingsMap.keySet()) {
+        for (var e : loginSettingsMap.entrySet()) {
+            DomainBareJid serviceName = e.getKey();
+            String autoLogin = e.getValue();
             buf.append("<gateway>");
-            String autoLogin = loginSettingsMap.get(serviceName);
             buf.append("<serviceName>").append(serviceName).append("</serviceName>");
             buf.append("<autoLogin>").append(autoLogin).append("</autoLogin>");
             buf.append("</gateway>");
diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/invite/WorkgroupRosterTree.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/invite/WorkgroupRosterTree.java
index b2a881ab3..ea39b66d9 100644
--- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/invite/WorkgroupRosterTree.java
+++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/invite/WorkgroupRosterTree.java
@@ -88,8 +88,9 @@ public final class WorkgroupRosterTree extends JPanel {
     }
 
     private void changePresence(Jid user, Presence presence) {
-        for (JiveTreeNode node : addressMap.keySet()) {
-            final BareJid nodeUser = addressMap.get(node);
+        for (var e : addressMap.entrySet()) {
+            JiveTreeNode node = e.getKey();
+            BareJid nodeUser = e.getValue();
             if (user.isParentOf(nodeUser)) {
                 if (!PresenceManager.isAvailable(presence)) {
                     node.setIcon(FastpathRes.getImageIcon(FastpathRes.RED_BALL));