diff --git a/build_num b/build_num
index 9a5a0b104..000f6dc11 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 1558
+#define BUILD_NUM 1559
diff --git a/src/gui/ClusterGroupDialog.cpp b/src/gui/ClusterGroupDialog.cpp
index 882de0b51..f292182d6 100644
--- a/src/gui/ClusterGroupDialog.cpp
+++ b/src/gui/ClusterGroupDialog.cpp
@@ -357,7 +357,16 @@ void ClusterGroupDialog::openParametersEditor()
 
     if (dlg)
     {
-        dlg->exec();
+        if (dlg->exec() == QDialog::Accepted)
+        {
+            // modal dialog, dialog saves data into the object
+            
+            // update object tree (if protocol type has changed, the
+            // object properties summary text may have to change too)
+            mw->activeProject()->updateObjectInTree(obj, true);
+            changed();
+            BaseObjectDialog::applyChanges();
+        }
         delete dlg;
     }
 }
diff --git a/src/gui/InterfaceDialog.cpp b/src/gui/InterfaceDialog.cpp
index b49d3c16f..7fa45c830 100644
--- a/src/gui/InterfaceDialog.cpp
+++ b/src/gui/InterfaceDialog.cpp
@@ -321,7 +321,7 @@ void InterfaceDialog::loadFWObject(FWObject *o)
 
     //apply->setEnabled( false );
 
-    init=false;
+    init = false;
 }
 
 void InterfaceDialog::validate(bool *res)
@@ -372,8 +372,6 @@ void InterfaceDialog::validate(bool *res)
     delete int_prop;
 }
 
-
-
 void InterfaceDialog::applyChanges()
 {
     Interface *s = Interface::cast(obj);
@@ -451,11 +449,13 @@ void InterfaceDialog::openIfaceDialog()
         {
             // modal dialog, dialog saves data into the object
             
-            // update object tree (if interface type has changed, the object properties
-            // summary text may have to change too)
+            // update object tree (if interface type has changed, the
+            // object properties summary text may have to change too)
             mw->activeProject()->updateObjectInTree(obj, true);
+            changed();
             BaseObjectDialog::applyChanges();
         }
+        delete w;
     }
     catch (FWException &ex)
     {
diff --git a/src/iptlib/PolicyCompiler_ipt.cpp b/src/iptlib/PolicyCompiler_ipt.cpp
index 58aa5f5fa..9175624ba 100644
--- a/src/iptlib/PolicyCompiler_ipt.cpp
+++ b/src/iptlib/PolicyCompiler_ipt.cpp
@@ -4811,6 +4811,7 @@ void PolicyCompiler_ipt::insertFailoverRule()
                         Interface *other_iface =
                             Interface::cast(FWObjectReference::getObject(*it));
                         assert(other_iface);
+                        if (other_iface->getId() == fw_iface->getId()) continue;
                         rule = addMgmtRule(other_iface,
                                            fw_iface,
                                            heartbeat_srv,