diff --git a/src/gui/ActionsDialog.cpp b/src/gui/ActionsDialog.cpp
index 07c13de2f..d0f548ca5 100644
--- a/src/gui/ActionsDialog.cpp
+++ b/src/gui/ActionsDialog.cpp
@@ -412,24 +412,17 @@ void ActionsDialog::setRule(PolicyRule *r )
     else if (editor=="BranchChain")
     {
         w=m_dialog->BranchChainPage;
-        std::string id = ropt->getStr("branch_id");
-        FWObject * o = rule->getRoot()->getById(id,true);
-        if (o!=NULL)
-        {
-            BranchChainArea->setObject(o);
-        }
+        RuleSet *ruleset = r->getBranch();
+        if (ruleset!=NULL) BranchChainArea->setObject(ruleset);
+
         //data.registerOption ( m_dialog->branchChainName     , ropt , "branch_name" );
         data.registerOption ( m_dialog->ipt_branch_in_mangle, ropt , "ipt_branch_in_mangle" );
     }
     else if (editor=="BranchAnchor")
     {
         w=m_dialog->BranchAnchorPage;
-        std::string id = ropt->getStr("branch_id");
-        FWObject * o = rule->getRoot()->getById(id,true);
-        if (o!=NULL)
-        {
-            BranchAnchorArea->setObject(o);
-        }
+        RuleSet *ruleset = r->getBranch();
+        if (ruleset!=NULL) BranchChainArea->setObject(ruleset);
 
         //int idx = ropt->getInt("branch_id");
         //data.registerOption ( m_dialog->branchAnchorName    , ropt , "branch_name" );
diff --git a/src/pflib/PolicyCompiler_pf.cpp b/src/pflib/PolicyCompiler_pf.cpp
index a6e5532ad..bbe9d097c 100644
--- a/src/pflib/PolicyCompiler_pf.cpp
+++ b/src/pflib/PolicyCompiler_pf.cpp
@@ -349,9 +349,9 @@ bool PolicyCompiler_pf::fillDirection::processNext()
         {
 	    rule->setDirection( PolicyRule::Both );
 
-	    Address  *src=compiler->getFirstSrc(rule);
-	    Address  *dst=compiler->getFirstDst(rule);
-	    string    fwid=compiler->getFwId();
+	    Address  *src = compiler->getFirstSrc(rule);
+	    Address  *dst = compiler->getFirstDst(rule);
+	    string    fwid = compiler->getFwId();
 
             if (src==NULL || dst==NULL)
                 compiler->abort("Broken src or dst in rule "+rule->getLabel());