diff --git a/Systems/a320-fbw.xml b/Systems/a320-fbw.xml
index e8ce9803..27dc5285 100644
--- a/Systems/a320-fbw.xml
+++ b/Systems/a320-fbw.xml
@@ -346,7 +346,7 @@
 			</test>
 		</switch>
 		
-		<switch name="/systems/fctl/fac1-healthy">
+		<switch name="/systems/fctl/fac1-healthy-inp">
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/controls/fctl/switches/fac1 eq 1
@@ -358,6 +358,12 @@
 			</test>
 		</switch>
 		
+		<actuator name="/systems/fctl/fac1-healthy">
+			<input>/systems/fctl/fac1-healthy-inp</input>
+			<rate_limit sense="incr">100</rate_limit>
+			<rate_limit sense="decr">10</rate_limit>
+		</actuator>
+		
 		<switch name="/systems/fctl/fac1-healthy-latch-set">
 			<default value="0"/>
 			<test logic="AND" value="1">
@@ -387,7 +393,7 @@
 		<switch name="/systems/fctl/fac1-healthy-signal">
 			<default value="0"/>
 			<test logic="AND" value="1">
-				/systems/fctl/fac1-healthy eq 1
+				/systems/fctl/fac1-healthy ne 0
 				<test logic="OR">
 					/systems/fctl/fac1-healthy-latch eq 0
 					/gear/gear[0]/wow eq 1
@@ -407,11 +413,11 @@
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/controls/fctl/switches/fac1 eq 1
-				/systems/fctl/fac1-healthy eq 1
+				/systems/fctl/fac1-healthy-signal eq 1
 			</test>
 		</switch>
 		
-		<switch name="/systems/fctl/fac2-healthy">
+		<switch name="/systems/fctl/fac2-healthy-inp">
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/controls/fctl/switches/fac2 eq 1
@@ -423,6 +429,12 @@
 			</test>
 		</switch>
 		
+		<actuator name="/systems/fctl/fac2-healthy">
+			<input>/systems/fctl/fac2-healthy-inp</input>
+			<rate_limit sense="incr">100</rate_limit>
+			<rate_limit sense="decr">10</rate_limit>
+		</actuator>
+		
 		<switch name="/systems/fctl/fac2-healthy-latch-set">
 			<default value="0"/>
 			<test logic="AND" value="1">
@@ -452,7 +464,7 @@
 		<switch name="/systems/fctl/fac2-healthy-signal">
 			<default value="0"/>
 			<test logic="AND" value="1">
-				/systems/fctl/fac2-healthy eq 1
+				/systems/fctl/fac2-healthy ne 0
 				<test logic="OR">
 					/systems/fctl/fac2-healthy-latch eq 0
 					/gear/gear[0]/wow eq 1
@@ -472,7 +484,7 @@
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/controls/fctl/switches/fac2 eq 1
-				/systems/fctl/fac2-healthy eq 1
+				/systems/fctl/fac2-healthy-signal eq 1
 			</test>
 		</switch>
 		
diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml
index 02f77871..e18ee2b9 100644
--- a/Systems/a320-fwc.xml
+++ b/Systems/a320-fwc.xml
@@ -1340,6 +1340,8 @@
 		<switch name="/ECAM/warnings/logic/fac-1-fault">
 			<default value="0"/>
 			<test logic="AND" value="1">
+				/systems/navigation/adr/operating-1 eq 1
+				/systems/navigation/adr/operating-3 eq 1
 				/systems/electrical/bus/dc-ess ge 25
 				/systems/electrical/bus/dc-ess-shed ge 25
 				/systems/electrical/bus/ac-ess ge 110
@@ -1351,6 +1353,8 @@
 		<switch name="/ECAM/warnings/logic/fac-2-fault">
 			<default value="0"/>
 			<test logic="AND" value="1">
+				/systems/navigation/adr/operating-2 eq 1
+				/systems/navigation/adr/operating-3 eq 1
 				/systems/electrical/bus/dc-2 ge 25
 				/systems/electrical/bus/ac-2 ge 110
 				/systems/fctl/fac1-healthy-signal eq 1