diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 798bd6ddf..2b3996194 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -265,7 +265,13 @@ int main( int argc, char *argv[] )
     // setup single shot timer to call startupLoad()
     QTimer::singleShot(500, mw, SLOT(startupLoad()));
 
-    app->exec();
+    try
+    {
+        app->exec();
+    } catch (const FWException &ex)
+    {
+        qDebug() << "Caught FWException: " << ex.toString().c_str();
+    }
 
     mw->hide();  // must do this before settings object is destroyed
 
diff --git a/src/import/PIXImporter.cpp b/src/import/PIXImporter.cpp
index 2a851315f..ac36ff2ea 100644
--- a/src/import/PIXImporter.cpp
+++ b/src/import/PIXImporter.cpp
@@ -629,26 +629,31 @@ Firewall* PIXImporter::finalize()
     {
         Firewall *fw = Firewall::cast(getFirewallObject());
 
-        QString pl = QString(discovered_platform.c_str()).toLower();
-        if (pl == "asa") pl = "pix";
-
-        string host_os;
-
-        if (pl == "pix") host_os = "pix_os";
-        if (pl == "fwsm") host_os = "fwsm_os";
-
-        if (! host_os.empty())
+        if (! discovered_platform.empty())
         {
-            fw->setStr("host_OS", host_os);
-            Resources::setDefaultTargetOptions(host_os , fw);
+            QString pl = QString(discovered_platform.c_str()).toLower();
+
+            fw->setStr("platform", pl.toStdString());
+
+            if (pl == "asa") pl = "pix";
+
+            string host_os;
+
+            if (pl == "pix") host_os = "pix_os";
+            if (pl == "fwsm") host_os = "fwsm_os";
+
+            if (! host_os.empty())
+            {
+                fw->setStr("host_OS", host_os);
+                Resources::setDefaultTargetOptions(host_os , fw);
+            }
+
+            string version = findBestVersionMatch(
+                pl, discovered_version.c_str()).toStdString();
+
+            if ( ! version.empty()) fw->setStr("version", version);
         }
 
-        string version = findBestVersionMatch(
-            pl, discovered_version.c_str()).toStdString();
-
-        if ( ! version.empty())
-            fw->setStr("version", version);
-
         rearrangeVlanInterfaces();
 
         FWObject *policy = getFirewallObject()->getFirstByType(Policy::TYPENAME);
diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.0-names.fwb b/src/unit_tests/PIXImporterTest/test_data/asa8.0-names.fwb
index 9606ae06e..927b168b5 100644
--- a/src/unit_tests/PIXImporterTest/test_data/asa8.0-names.fwb
+++ b/src/unit_tests/PIXImporterTest/test_data/asa8.0-names.fwb
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
-<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302235772" id="root">
+<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302831932" id="root">
   <Library id="syslib000" color="#d4f8ff" name="Standard" comment="Standard objects" ro="True">
     <AnyNetwork id="sysid0" name="Any" comment="Any Network" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
     <AnyIPService id="sysid1" protocol_num="0" name="Any" comment="Any IP Service" ro="False"/>
@@ -494,7 +494,7 @@
       <ServiceGroup id="id49" name="TagServices" comment="" ro="False"/>
     </ServiceGroup>
     <ObjectGroup id="id50" name="Firewalls" comment="" ro="False">
-      <Firewall id="id51" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="8.0" name="pixfirewall" comment="Created during import of  line 5" ro="False">
+      <Firewall id="id51" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="8.0" name="test_fw" comment="Created during import of  line 14" ro="False">
         <NAT id="id283" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </NAT>
@@ -886,11 +886,11 @@
           <RuleSetOptions/>
         </Routing>
         <Interface id="id287" dedicated_failover="False" dyn="False" label="inside" security_level="100" unnum="False" unprotected="False" name="Ethernet0" comment="Created during import of  line 14" ro="False">
-          <IPv4 id="id288" name="pixfirewall:Ethernet0:ip" comment="Created during import of  line 16" ro="False" address="192.168.2.221" netmask="255.255.255.0"/>
+          <IPv4 id="id288" name="test_fw:Ethernet0:ip" comment="Created during import of  line 16" ro="False" address="192.168.2.221" netmask="255.255.255.0"/>
           <InterfaceOptions/>
         </Interface>
         <Interface id="id290" dedicated_failover="False" dyn="False" label="outside" security_level="0" unnum="False" unprotected="False" name="Ethernet1" comment="Created during import of  line 19" ro="False">
-          <IPv4 id="id291" name="pixfirewall:Ethernet1:ip" comment="Created during import of  line 21" ro="False" address="192.0.2.221" netmask="255.255.255.0"/>
+          <IPv4 id="id291" name="test_fw:Ethernet1:ip" comment="Created during import of  line 21" ro="False" address="192.0.2.221" netmask="255.255.255.0"/>
           <InterfaceOptions/>
         </Interface>
         <FirewallOptions>
@@ -903,6 +903,7 @@
           <Option name="pix_floodguard">true</Option>
           <Option name="pix_generate_out_acl">true</Option>
           <Option name="pix_include_comments">true</Option>
+          <Option name="pix_resetoutside_supported">true</Option>
           <Option name="pix_route_dnat_supported">true</Option>
           <Option name="pix_rule_syslog_settings">false</Option>
           <Option name="pix_security_fragguard_supported">true</Option>
diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.0-names.output b/src/unit_tests/PIXImporterTest/test_data/asa8.0-names.output
index 915e376e4..140d67343 100644
--- a/src/unit_tests/PIXImporterTest/test_data/asa8.0-names.output
+++ b/src/unit_tests/PIXImporterTest/test_data/asa8.0-names.output
@@ -1,6 +1,5 @@
 3: Platform: PIX
 3: Version: 8.0
-5: Host name: pixfirewall
 14: New interface: Ethernet0
 14: Interface parameters: inside  
 14: Interface label: inside
diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.0.fwb b/src/unit_tests/PIXImporterTest/test_data/asa8.0.fwb
index 37f22e042..92a308b55 100644
--- a/src/unit_tests/PIXImporterTest/test_data/asa8.0.fwb
+++ b/src/unit_tests/PIXImporterTest/test_data/asa8.0.fwb
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
-<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302235771" id="root">
+<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302832095" id="root">
   <Library id="syslib000" color="#d4f8ff" name="Standard" comment="Standard objects" ro="True">
     <AnyNetwork id="sysid0" name="Any" comment="Any Network" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
     <AnyIPService id="sysid1" protocol_num="0" name="Any" comment="Any IP Service" ro="False"/>
@@ -576,7 +576,7 @@
       <ServiceGroup id="id117" name="TagServices" comment="" ro="False"/>
     </ServiceGroup>
     <ObjectGroup id="id118" name="Firewalls" comment="" ro="False">
-      <Firewall id="id119" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="8.0" name="pixfirewall" comment="Created during import of  line 5" ro="False">
+      <Firewall id="id119" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="8.0" name="test_fw" comment="Created during import of  line 9" ro="False">
         <NAT id="id327" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </NAT>
@@ -927,11 +927,11 @@
           <RuleSetOptions/>
         </Routing>
         <Interface id="id331" dedicated_failover="False" dyn="False" label="inside" security_level="100" unnum="False" unprotected="False" name="Ethernet0" comment="Created during import of  line 9" ro="False">
-          <IPv4 id="id332" name="pixfirewall:Ethernet0:ip" comment="Created during import of  line 11" ro="False" address="192.168.2.221" netmask="255.255.255.0"/>
+          <IPv4 id="id332" name="test_fw:Ethernet0:ip" comment="Created during import of  line 11" ro="False" address="192.168.2.221" netmask="255.255.255.0"/>
           <InterfaceOptions/>
         </Interface>
         <Interface id="id334" dedicated_failover="False" dyn="False" label="outside" security_level="0" unnum="False" unprotected="False" name="Ethernet1" comment="Created during import of  line 14" ro="False">
-          <IPv4 id="id335" name="pixfirewall:Ethernet1:ip" comment="Created during import of  line 16" ro="False" address="192.0.2.221" netmask="255.255.255.0"/>
+          <IPv4 id="id335" name="test_fw:Ethernet1:ip" comment="Created during import of  line 16" ro="False" address="192.0.2.221" netmask="255.255.255.0"/>
           <InterfaceOptions/>
         </Interface>
         <FirewallOptions>
@@ -944,6 +944,7 @@
           <Option name="pix_floodguard">true</Option>
           <Option name="pix_generate_out_acl">true</Option>
           <Option name="pix_include_comments">true</Option>
+          <Option name="pix_resetoutside_supported">true</Option>
           <Option name="pix_route_dnat_supported">true</Option>
           <Option name="pix_rule_syslog_settings">false</Option>
           <Option name="pix_security_fragguard_supported">true</Option>
diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.0.output b/src/unit_tests/PIXImporterTest/test_data/asa8.0.output
index 8078eac41..cdee5005c 100644
--- a/src/unit_tests/PIXImporterTest/test_data/asa8.0.output
+++ b/src/unit_tests/PIXImporterTest/test_data/asa8.0.output
@@ -1,6 +1,5 @@
 3: Platform: PIX
 3: Version: 8.0
-5: Host name: pixfirewall
 9: New interface: Ethernet0
 9: Interface parameters: inside  
 9: Interface label: inside
diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl-object-groups.fwb b/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl-object-groups.fwb
index 57e125a28..e000ac4ed 100644
--- a/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl-object-groups.fwb
+++ b/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl-object-groups.fwb
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
-<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302235772" id="root">
+<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302832016" id="root">
   <Library id="syslib000" color="#d4f8ff" name="Standard" comment="Standard objects" ro="True">
     <AnyNetwork id="sysid0" name="Any" comment="Any Network" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
     <AnyIPService id="sysid1" protocol_num="0" name="Any" comment="Any IP Service" ro="False"/>
@@ -519,7 +519,7 @@
       <ServiceGroup id="id70" name="TagServices" comment="" ro="False"/>
     </ServiceGroup>
     <ObjectGroup id="id71" name="Firewalls" comment="" ro="False">
-      <Firewall id="id72" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="8.3" name="asa5505" comment="Created during import of  line 5" ro="False">
+      <Firewall id="id72" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="asa" version="8.3" name="test_fw" comment="Created during import of  line 8" ro="False">
         <NAT id="id388" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </NAT>
@@ -1050,7 +1050,7 @@
           <RuleSetOptions/>
         </Routing>
         <Interface id="id392" dedicated_failover="False" dyn="False" label="inside" security_level="100" unnum="False" unprotected="False" name="Vlan1" comment="Created during import of  line 8" ro="False">
-          <IPv4 id="id393" name="asa5505:Vlan1:ip" comment="Created during import of  line 10" ro="False" address="192.168.1.1" netmask="255.255.255.0"/>
+          <IPv4 id="id393" name="test_fw:Vlan1:ip" comment="Created during import of  line 10" ro="False" address="192.168.1.1" netmask="255.255.255.0"/>
           <InterfaceOptions/>
         </Interface>
         <Interface id="id395" dedicated_failover="False" dyn="True" label="outside" security_level="0" unnum="False" unprotected="False" name="Vlan2" comment="Created during import of  line 14" ro="False">
@@ -1069,6 +1069,7 @@
           <Option name="pix_floodguard">true</Option>
           <Option name="pix_generate_out_acl">true</Option>
           <Option name="pix_include_comments">true</Option>
+          <Option name="pix_resetoutside_supported">true</Option>
           <Option name="pix_route_dnat_supported">true</Option>
           <Option name="pix_rule_syslog_settings">false</Option>
           <Option name="pix_security_fragguard_supported">true</Option>
diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl-object-groups.output b/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl-object-groups.output
index 5e18b787c..56e261ef9 100644
--- a/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl-object-groups.output
+++ b/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl-object-groups.output
@@ -1,6 +1,5 @@
 3: Platform: ASA
 3: Version: 8.3
-5: Host name: asa5505
 8: New interface: Vlan1
 8: Interface parameters: inside  
 8: Interface label: inside
diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.fwb b/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.fwb
index 1037df7e8..69a07804f 100644
--- a/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.fwb
+++ b/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.fwb
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
-<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302235772" id="root">
+<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302831986" id="root">
   <Library id="syslib000" color="#d4f8ff" name="Standard" comment="Standard objects" ro="True">
     <AnyNetwork id="sysid0" name="Any" comment="Any Network" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
     <AnyIPService id="sysid1" protocol_num="0" name="Any" comment="Any IP Service" ro="False"/>
@@ -675,7 +675,7 @@
       <ServiceGroup id="id195" name="TagServices" comment="" ro="False"/>
     </ServiceGroup>
     <ObjectGroup id="id196" name="Firewalls" comment="" ro="False">
-      <Firewall id="id197" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="8.3" name="asa5505" comment="Created during import of  line 5" ro="False">
+      <Firewall id="id197" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="asa" version="8.3" name="test_fw" comment="Created during import of  line 8" ro="False">
         <NAT id="id1125" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </NAT>
@@ -2235,7 +2235,7 @@
           <RuleSetOptions/>
         </Routing>
         <Interface id="id1129" dedicated_failover="False" dyn="False" label="inside" security_level="100" unnum="False" unprotected="False" name="Vlan1" comment="Created during import of  line 8" ro="False">
-          <IPv4 id="id1130" name="asa5505:Vlan1:ip" comment="Created during import of  line 10" ro="False" address="192.168.1.1" netmask="255.255.255.0"/>
+          <IPv4 id="id1130" name="test_fw:Vlan1:ip" comment="Created during import of  line 10" ro="False" address="192.168.1.1" netmask="255.255.255.0"/>
           <InterfaceOptions/>
         </Interface>
         <Interface id="id1132" dedicated_failover="False" dyn="True" label="outside" security_level="0" unnum="False" unprotected="False" name="Vlan2" comment="Created during import of  line 14" ro="False">
@@ -2254,6 +2254,7 @@
           <Option name="pix_floodguard">true</Option>
           <Option name="pix_generate_out_acl">true</Option>
           <Option name="pix_include_comments">true</Option>
+          <Option name="pix_resetoutside_supported">true</Option>
           <Option name="pix_route_dnat_supported">true</Option>
           <Option name="pix_rule_syslog_settings">false</Option>
           <Option name="pix_security_fragguard_supported">true</Option>
diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.output b/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.output
index bc2ea496d..a15a14dac 100644
--- a/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.output
+++ b/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.output
@@ -1,6 +1,5 @@
 3: Platform: ASA
 3: Version: 8.3
-5: Host name: asa5505
 8: New interface: Vlan1
 8: Interface parameters: inside  
 8: Interface label: inside
diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.3-objects-and-groups.fwb b/src/unit_tests/PIXImporterTest/test_data/asa8.3-objects-and-groups.fwb
index a815637dd..6137d415d 100644
--- a/src/unit_tests/PIXImporterTest/test_data/asa8.3-objects-and-groups.fwb
+++ b/src/unit_tests/PIXImporterTest/test_data/asa8.3-objects-and-groups.fwb
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
-<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302235771" id="root">
+<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302832040" id="root">
   <Library id="syslib000" color="#d4f8ff" name="Standard" comment="Standard objects" ro="True">
     <AnyNetwork id="sysid0" name="Any" comment="Any Network" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
     <AnyIPService id="sysid1" protocol_num="0" name="Any" comment="Any IP Service" ro="False"/>
@@ -835,7 +835,7 @@
       <ServiceGroup id="id339" name="TagServices" comment="" ro="False"/>
     </ServiceGroup>
     <ObjectGroup id="id340" name="Firewalls" comment="" ro="False">
-      <Firewall id="id341" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="8.3" name="asa5505" comment="Created during import of  line 5" ro="False">
+      <Firewall id="id341" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="asa" version="8.3" name="test_fw" comment="Created during import of  line 7" ro="False">
         <NAT id="id357" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </NAT>
@@ -869,7 +869,7 @@
           <InterfaceOptions/>
         </Interface>
         <Interface id="id363" dedicated_failover="False" dyn="False" label="outside" security_level="0" unnum="False" unprotected="False" name="Vlan2" comment="outside interface " ro="False">
-          <IPv4 id="id364" name="asa5505:Vlan2:ip" comment="Created during import of  line 16" ro="False" address="192.168.2.1" netmask="255.255.255.0"/>
+          <IPv4 id="id364" name="test_fw:Vlan2:ip" comment="Created during import of  line 16" ro="False" address="192.168.2.1" netmask="255.255.255.0"/>
           <InterfaceOptions/>
         </Interface>
         <Interface id="id366" dedicated_failover="False" dyn="False" security_level="0" unnum="True" unprotected="False" name="Ethernet0/0" comment="Switch port 0 / 0 " ro="False">
@@ -885,6 +885,7 @@
           <Option name="pix_floodguard">true</Option>
           <Option name="pix_generate_out_acl">true</Option>
           <Option name="pix_include_comments">true</Option>
+          <Option name="pix_resetoutside_supported">true</Option>
           <Option name="pix_route_dnat_supported">true</Option>
           <Option name="pix_rule_syslog_settings">false</Option>
           <Option name="pix_security_fragguard_supported">true</Option>
diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.3-objects-and-groups.output b/src/unit_tests/PIXImporterTest/test_data/asa8.3-objects-and-groups.output
index 05ab516c3..f0b43ad52 100644
--- a/src/unit_tests/PIXImporterTest/test_data/asa8.3-objects-and-groups.output
+++ b/src/unit_tests/PIXImporterTest/test_data/asa8.3-objects-and-groups.output
@@ -1,6 +1,5 @@
 3: Platform: ASA
 3: Version: 8.3
-5: Host name: asa5505
 7: New interface: Vlan1
 7: Interface comment: inside interface 
 8: Interface parameters: inside  
diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.3.fwb b/src/unit_tests/PIXImporterTest/test_data/asa8.3.fwb
index f00e649a3..33d29de60 100644
--- a/src/unit_tests/PIXImporterTest/test_data/asa8.3.fwb
+++ b/src/unit_tests/PIXImporterTest/test_data/asa8.3.fwb
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
-<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302235771" id="root">
+<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302832095" id="root">
   <Library id="syslib000" color="#d4f8ff" name="Standard" comment="Standard objects" ro="True">
     <AnyNetwork id="sysid0" name="Any" comment="Any Network" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
     <AnyIPService id="sysid1" protocol_num="0" name="Any" comment="Any IP Service" ro="False"/>
@@ -466,7 +466,7 @@
       <ServiceGroup id="id29" name="TagServices" comment="" ro="False"/>
     </ServiceGroup>
     <ObjectGroup id="id30" name="Firewalls" comment="" ro="False">
-      <Firewall id="id31" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="8.3" name="asa5505" comment="Created during import of  line 5" ro="False">
+      <Firewall id="id31" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="asa" version="8.3" name="test_fw" comment="Created during import of  line 14" ro="False">
         <NAT id="id95" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </NAT>
@@ -603,7 +603,7 @@
           <InterfaceOptions/>
         </Interface>
         <Interface id="id101" dedicated_failover="False" dyn="False" label="outside" security_level="0" unnum="False" unprotected="False" name="Vlan2" comment="outside interface " ro="False">
-          <IPv4 id="id102" name="asa5505:Vlan2:ip" comment="Created during import of  line 23" ro="False" address="192.168.2.1" netmask="255.255.255.0"/>
+          <IPv4 id="id102" name="test_fw:Vlan2:ip" comment="Created during import of  line 23" ro="False" address="192.168.2.1" netmask="255.255.255.0"/>
           <InterfaceOptions/>
         </Interface>
         <Interface id="id104" dedicated_failover="False" dyn="False" security_level="0" unnum="True" unprotected="False" name="Ethernet0/0" comment="Switch port 0 / 0 " ro="False">
@@ -622,6 +622,7 @@
           <Option name="pix_floodguard">true</Option>
           <Option name="pix_generate_out_acl">true</Option>
           <Option name="pix_include_comments">true</Option>
+          <Option name="pix_resetoutside_supported">true</Option>
           <Option name="pix_route_dnat_supported">true</Option>
           <Option name="pix_rule_syslog_settings">false</Option>
           <Option name="pix_security_fragguard_supported">true</Option>
diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.3.output b/src/unit_tests/PIXImporterTest/test_data/asa8.3.output
index 636140689..3642c6af3 100644
--- a/src/unit_tests/PIXImporterTest/test_data/asa8.3.output
+++ b/src/unit_tests/PIXImporterTest/test_data/asa8.3.output
@@ -1,6 +1,5 @@
 3: Platform: ASA
 3: Version: 8.3
-5: Host name: asa5505
 14: New interface: Vlan1
 14: Interface comment: inside interface 
 15: Interface parameters: inside  
diff --git a/src/unit_tests/PIXImporterTest/test_data/pix6.fwb b/src/unit_tests/PIXImporterTest/test_data/pix6.fwb
index 0ccbfc37a..a02495d6b 100644
--- a/src/unit_tests/PIXImporterTest/test_data/pix6.fwb
+++ b/src/unit_tests/PIXImporterTest/test_data/pix6.fwb
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
-<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302235771" id="root">
+<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302832156" id="root">
   <Library id="syslib000" color="#d4f8ff" name="Standard" comment="Standard objects" ro="True">
     <AnyNetwork id="sysid0" name="Any" comment="Any Network" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
     <AnyIPService id="sysid1" protocol_num="0" name="Any" comment="Any IP Service" ro="False"/>
@@ -520,7 +520,7 @@
       <ServiceGroup id="id75" name="TagServices" comment="" ro="False"/>
     </ServiceGroup>
     <ObjectGroup id="id76" name="Firewalls" comment="" ro="False">
-      <Firewall id="id77" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="6.3" name="guardian" comment="Created during import of  line 4" ro="False">
+      <Firewall id="id77" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="6.3" name="test_fw" comment="Created during import of  line 4" ro="False">
         <NAT id="id573" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <NATRule id="id576" disabled="False" group="" position="0" action="Translate" comment="Created during import of  line 171">
             <OSrc neg="False">
@@ -1674,7 +1674,7 @@
           <InterfaceOptions/>
         </Interface>
         <Interface id="id760" dedicated_failover="False" dyn="False" label="inside" security_level="100" unnum="False" unprotected="False" name="ethernet1" comment="Created during import of  line 5" ro="False">
-          <IPv4 id="id761" name="guardian:ethernet1:ip" comment="Created during import of  line 159" ro="False" address="10.1.1.202" netmask="255.255.255.0"/>
+          <IPv4 id="id761" name="test_fw:ethernet1:ip" comment="Created during import of  line 159" ro="False" address="10.1.1.202" netmask="255.255.255.0"/>
           <InterfaceOptions/>
         </Interface>
         <FirewallOptions>
@@ -1687,6 +1687,7 @@
           <Option name="pix_floodguard">true</Option>
           <Option name="pix_generate_out_acl">true</Option>
           <Option name="pix_include_comments">true</Option>
+          <Option name="pix_resetoutside_supported">true</Option>
           <Option name="pix_route_dnat_supported">true</Option>
           <Option name="pix_rule_syslog_settings">false</Option>
           <Option name="pix_security_fragguard_supported">true</Option>
diff --git a/src/unit_tests/PIXImporterTest/test_data/pix6.output b/src/unit_tests/PIXImporterTest/test_data/pix6.output
index 0701fc738..1aefc836e 100644
--- a/src/unit_tests/PIXImporterTest/test_data/pix6.output
+++ b/src/unit_tests/PIXImporterTest/test_data/pix6.output
@@ -4,7 +4,6 @@
 5: New interface: ethernet1
 5: Interface parameters: ethernet0 outside security0
 5: Interface parameters: ethernet1 inside security100
-10: Host name: guardian
 34: Object Group (icmp) inside.id12349X2458.srv.icmp.0
 38: Object Group (icmp) outside.id12363X2458.srv.icmp.0
 43: Object Group (service) outside.id12376X2458.srv.udp.0
diff --git a/src/unit_tests/PIXImporterTest/test_data/pix7-nat.fwb b/src/unit_tests/PIXImporterTest/test_data/pix7-nat.fwb
index 2f75550dc..b8f851b9a 100644
--- a/src/unit_tests/PIXImporterTest/test_data/pix7-nat.fwb
+++ b/src/unit_tests/PIXImporterTest/test_data/pix7-nat.fwb
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
-<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302306262" id="root">
+<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302832095" id="root">
   <Library id="syslib000" color="#d4f8ff" name="Standard" comment="Standard objects" ro="True">
     <AnyNetwork id="sysid0" name="Any" comment="Any Network" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
     <AnyIPService id="sysid1" protocol_num="0" name="Any" comment="Any IP Service" ro="False"/>
@@ -565,7 +565,7 @@
       <ServiceGroup id="id120" name="TagServices" comment="" ro="False"/>
     </ServiceGroup>
     <ObjectGroup id="id121" name="Firewalls" comment="" ro="False">
-      <Firewall id="id122" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="7.0" name="pix1" comment="Created during import of  line 6" ro="False">
+      <Firewall id="id122" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="7.0" name="test_fw" comment="Created during import of  line 16" ro="False">
         <NAT id="id330" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <NATRule id="id333" disabled="False" group="" position="0" action="Translate" comment="Created during import of  line 143">
             <OSrc neg="False">
@@ -3036,14 +3036,14 @@
         <Interface id="id1739" dedicated_failover="False" dyn="False" security_level="0" unnum="True" unprotected="False" name="Ethernet0" comment="Created during import of  line 16" ro="False">
           <InterfaceOptions/>
           <Interface id="id1741" dedicated_failover="False" dyn="False" label="outside" security_level="0" unnum="False" unprotected="False" name="Ethernet0.101" comment="Created during import of  line 21" ro="False">
-            <IPv4 id="id1743" name="pix1:Ethernet0.101:ip" comment="Created during import of  line 24" ro="False" address="192.0.2.253" netmask="255.255.255.0"/>
+            <IPv4 id="id1743" name="test_fw:Ethernet0.101:ip" comment="Created during import of  line 24" ro="False" address="192.0.2.253" netmask="255.255.255.0"/>
             <InterfaceOptions>
               <Option name="type">8021q</Option>
               <Option name="vlan_id">101</Option>
             </InterfaceOptions>
           </Interface>
           <Interface id="id1744" dedicated_failover="False" dyn="False" label="dmz20" security_level="20" unnum="False" unprotected="False" name="Ethernet0.102" comment="Created during import of  line 27" ro="False">
-            <IPv4 id="id1746" name="pix1:Ethernet0.102:ip" comment="Created during import of  line 30" ro="False" address="10.0.0.253" netmask="255.255.255.0"/>
+            <IPv4 id="id1746" name="test_fw:Ethernet0.102:ip" comment="Created during import of  line 30" ro="False" address="10.0.0.253" netmask="255.255.255.0"/>
             <InterfaceOptions>
               <Option name="type">8021q</Option>
               <Option name="vlan_id">102</Option>
@@ -3051,7 +3051,7 @@
           </Interface>
         </Interface>
         <Interface id="id1747" dedicated_failover="False" dyn="False" label="inside" security_level="100" unnum="False" unprotected="False" name="Ethernet1" comment="Created during import of  line 33" ro="False">
-          <IPv4 id="id1748" name="pix1:Ethernet1:ip" comment="Created during import of  line 37" ro="False" address="10.1.1.206" netmask="255.255.255.0"/>
+          <IPv4 id="id1748" name="test_fw:Ethernet1:ip" comment="Created during import of  line 37" ro="False" address="10.1.1.206" netmask="255.255.255.0"/>
           <InterfaceOptions/>
         </Interface>
         <FirewallOptions>
@@ -3064,6 +3064,7 @@
           <Option name="pix_floodguard">true</Option>
           <Option name="pix_generate_out_acl">true</Option>
           <Option name="pix_include_comments">true</Option>
+          <Option name="pix_resetoutside_supported">true</Option>
           <Option name="pix_route_dnat_supported">true</Option>
           <Option name="pix_rule_syslog_settings">false</Option>
           <Option name="pix_security_fragguard_supported">true</Option>
diff --git a/src/unit_tests/PIXImporterTest/test_data/pix7-nat.output b/src/unit_tests/PIXImporterTest/test_data/pix7-nat.output
index edd27ee70..5ad30862e 100644
--- a/src/unit_tests/PIXImporterTest/test_data/pix7-nat.output
+++ b/src/unit_tests/PIXImporterTest/test_data/pix7-nat.output
@@ -1,6 +1,5 @@
 3: Platform: PIX
 3: Version: 7.2
-6: Host name: pix1
 16: New interface: Ethernet0
 21: New interface: Ethernet0.101
 22: Interface parameters: outside  
diff --git a/src/unit_tests/PIXImporterTest/test_data/pix7.fwb b/src/unit_tests/PIXImporterTest/test_data/pix7.fwb
index 019eda960..d441a073b 100644
--- a/src/unit_tests/PIXImporterTest/test_data/pix7.fwb
+++ b/src/unit_tests/PIXImporterTest/test_data/pix7.fwb
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
-<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302235771" id="root">
+<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1302832131" id="root">
   <Library id="syslib000" color="#d4f8ff" name="Standard" comment="Standard objects" ro="True">
     <AnyNetwork id="sysid0" name="Any" comment="Any Network" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
     <AnyIPService id="sysid1" protocol_num="0" name="Any" comment="Any IP Service" ro="False"/>
@@ -484,7 +484,7 @@
       <ServiceGroup id="id42" name="TagServices" comment="" ro="False"/>
     </ServiceGroup>
     <ObjectGroup id="id43" name="Firewalls" comment="" ro="False">
-      <Firewall id="id44" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="7.0" name="pix1" comment="Created during import of  line 6" ro="False">
+      <Firewall id="id44" host_OS="pix_os" lastCompiled="0" lastInstalled="0" lastModified="0" platform="pix" version="7.0" name="test_fw" comment="Created during import of  line 16" ro="False">
         <NAT id="id252" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
           <RuleSetOptions/>
         </NAT>
@@ -872,14 +872,14 @@
         <Interface id="id256" dedicated_failover="False" dyn="False" security_level="0" unnum="True" unprotected="False" name="Ethernet0" comment="Created during import of  line 16" ro="False">
           <InterfaceOptions/>
           <Interface id="id258" dedicated_failover="False" dyn="False" label="outside" security_level="0" unnum="False" unprotected="False" name="Ethernet0.101" comment="Created during import of  line 21" ro="False">
-            <IPv4 id="id260" name="pix1:Ethernet0.101:ip" comment="Created during import of  line 24" ro="False" address="192.0.2.253" netmask="255.255.255.0"/>
+            <IPv4 id="id260" name="test_fw:Ethernet0.101:ip" comment="Created during import of  line 24" ro="False" address="192.0.2.253" netmask="255.255.255.0"/>
             <InterfaceOptions>
               <Option name="type">8021q</Option>
               <Option name="vlan_id">101</Option>
             </InterfaceOptions>
           </Interface>
           <Interface id="id261" dedicated_failover="False" dyn="False" label="dmz20" security_level="20" unnum="False" unprotected="False" name="Ethernet0.102" comment="Created during import of  line 27" ro="False">
-            <IPv4 id="id263" name="pix1:Ethernet0.102:ip" comment="Created during import of  line 30" ro="False" address="10.0.0.253" netmask="255.255.255.0"/>
+            <IPv4 id="id263" name="test_fw:Ethernet0.102:ip" comment="Created during import of  line 30" ro="False" address="10.0.0.253" netmask="255.255.255.0"/>
             <InterfaceOptions>
               <Option name="type">8021q</Option>
               <Option name="vlan_id">102</Option>
@@ -887,7 +887,7 @@
           </Interface>
         </Interface>
         <Interface id="id264" dedicated_failover="False" dyn="False" label="inside" security_level="100" unnum="False" unprotected="False" name="Ethernet1" comment="Created during import of  line 33" ro="False">
-          <IPv4 id="id265" name="pix1:Ethernet1:ip" comment="Created during import of  line 37" ro="False" address="10.1.1.206" netmask="255.255.255.0"/>
+          <IPv4 id="id265" name="test_fw:Ethernet1:ip" comment="Created during import of  line 37" ro="False" address="10.1.1.206" netmask="255.255.255.0"/>
           <InterfaceOptions/>
         </Interface>
         <Interface id="id267" dedicated_failover="False" dyn="False" security_level="0" unnum="True" unprotected="False" name="Ethernet2" comment="LAN/STATE Failover Interface " ro="False">
@@ -903,6 +903,7 @@
           <Option name="pix_floodguard">true</Option>
           <Option name="pix_generate_out_acl">true</Option>
           <Option name="pix_include_comments">true</Option>
+          <Option name="pix_resetoutside_supported">true</Option>
           <Option name="pix_route_dnat_supported">true</Option>
           <Option name="pix_rule_syslog_settings">false</Option>
           <Option name="pix_security_fragguard_supported">true</Option>
diff --git a/src/unit_tests/PIXImporterTest/test_data/pix7.output b/src/unit_tests/PIXImporterTest/test_data/pix7.output
index cbfda3847..1ff4547de 100644
--- a/src/unit_tests/PIXImporterTest/test_data/pix7.output
+++ b/src/unit_tests/PIXImporterTest/test_data/pix7.output
@@ -1,6 +1,5 @@
 3: Platform: PIX
 3: Version: 7.2
-6: Host name: pix1
 16: New interface: Ethernet0
 21: New interface: Ethernet0.101
 22: Interface parameters: outside