diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
index 8e1f1e2d..1cdede16 100644
--- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
+++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
@@ -593,7 +593,7 @@ var canvas_lowerECAM_apu = {
 			me["APUAvail"].hide();
 		}
 
-		if (tank3_content_lbs.getValue() < 100) {
+		if (!systems.FUEL.Pumps.apu.getBoolValue() and systems.FUEL.Pumps.allOff.getBoolValue()) {
 			me["APUfuelLO"].show();
 		} else {
 			me["APUfuelLO"].hide();
diff --git a/Nasal/FMGC/FCU.nas b/Nasal/FMGC/FCU.nas
index 03eee6f2..6f3b8585 100644
--- a/Nasal/FMGC/FCU.nas
+++ b/Nasal/FMGC/FCU.nas
@@ -100,6 +100,7 @@ var FCUController = {
 		if (me.FCUworking) {
 			if (!ap1.getBoolValue()) {
 				ap1Input.setValue(1);
+				libraries.apWarnNode.setValue(0);
 			} else {
 				apOff("hard", 1);
 			}
diff --git a/Nasal/Systems/fuel.nas b/Nasal/Systems/fuel.nas
index 918f6d7e..3c9ae9c2 100644
--- a/Nasal/Systems/fuel.nas
+++ b/Nasal/Systems/fuel.nas
@@ -22,6 +22,10 @@ var FUEL = {
 		pumpRight1: props.globals.getNode("/controls/fuel/switches/pump-right-1"),
 		pumpRight2: props.globals.getNode("/controls/fuel/switches/pump-right-2"),
 	},
+	Pumps: {
+		apu: props.globals.getNode("/systems/fuel/pumps/apu-operate"),
+		allOff: props.globals.getNode("/systems/fuel/pumps/all-eng-pump-off"),
+	},
 	Valves: {
 		crossfeed: props.globals.getNode("/systems/fuel/valves/crossfeed-valve"),
 		lpValve1: props.globals.getNode("/systems/fuel/valves/engine-1-lp-valve"),
diff --git a/Systems/a320-adr.xml b/Systems/a320-adr.xml
index 8e6b45b6..b929a839 100644
--- a/Systems/a320-adr.xml
+++ b/Systems/a320-adr.xml
@@ -13,9 +13,9 @@
 					<table>
 						<independentVar lookup="row">/velocities/groundspeed-kt</independentVar>
 						<tableData>
-							0  0.0
-							5  0.0
-							6  1.0
+							0   0.0
+							29  0.0
+							30  1.0
 						</tableData>
 					</table>
 				</product>