diff --git a/Systems/fmgc-drivers.xml b/Systems/fmgc-drivers.xml
index d04b9c99..d703c750 100644
--- a/Systems/fmgc-drivers.xml
+++ b/Systems/fmgc-drivers.xml
@@ -798,7 +798,7 @@
 					</not-equals>
 				</and>
 			</condition>
-			<value>50</value>
+			<value>1000</value>
 		</max-rate-of-change>
 		<max-rate-of-change>15</max-rate-of-change>
 	</filter>
diff --git a/Systems/fmgc-pitch.xml b/Systems/fmgc-pitch.xml
index c61e5dac..4a4ab589 100644
--- a/Systems/fmgc-pitch.xml
+++ b/Systems/fmgc-pitch.xml
@@ -356,7 +356,7 @@
 	</filter>
 	
 	<filter>
-		<name>TARGET FPM</name>
+		<name>Target FPM</name>
 		<debug>false</debug>
 		<type>gain</type>
 		<gain>1.0</gain>
@@ -420,6 +420,15 @@
 			</condition>
 			<property>/it-autoflight/internal/nav-rate-of-climb-fpm</property>
 		</input>
+		<input>
+			<condition>
+				<equals>
+					<property>/it-autoflight/output/vert</property>
+					<value>9</value>
+				</equals>
+			</condition>
+			<property>/it-autoflight/internal/vert-speed-fpm</property>
+		</input>
 		<output>/it-autoflight/internal/target-common-fpm</output>
 	</filter>
 	
@@ -447,6 +456,10 @@
 							<value>1</value>
 						</equals>
 					</or>
+					<not-equals>
+						<property>/it-autoflight/output/vert</property>
+						<value>9</value>
+					</not-equals>
 				</and>
 			</condition>
 		</enable>
@@ -600,6 +613,10 @@
 								<value>1</value>
 							</equals>
 						</or>
+						<not-equals>
+							<property>/it-autoflight/output/vert</property>
+							<value>9</value>
+						</not-equals>
 					</and>
 				</not>
 			</condition>
diff --git a/Systems/fmgc-roll-yaw.xml b/Systems/fmgc-roll-yaw.xml
index a74f54cc..49afbc28 100644
--- a/Systems/fmgc-roll-yaw.xml
+++ b/Systems/fmgc-roll-yaw.xml
@@ -144,24 +144,30 @@
 		<gain>1.0</gain>
 		<enable>
 			<condition>
-				<and>
-					<not-equals>
-						<property>/it-autoflight/output/ap1</property>
-						<value>1</value>
-					</not-equals>
-					<not-equals>
-						<property>/it-autoflight/output/ap2</property>
-						<value>1</value>
-					</not-equals>
-					<not-equals>
-						<property>/it-autoflight/output/fd1</property>
-						<value>1</value>
-					</not-equals>
-					<not-equals>
-						<property>/it-autoflight/output/fd2</property>
-						<value>1</value>
-					</not-equals>
-				</and>
+				<or>
+					<and>
+						<not-equals>
+							<property>/it-autoflight/output/ap1</property>
+							<value>1</value>
+						</not-equals>
+						<not-equals>
+							<property>/it-autoflight/output/ap2</property>
+							<value>1</value>
+						</not-equals>
+						<not-equals>
+							<property>/it-autoflight/output/fd1</property>
+							<value>1</value>
+						</not-equals>
+						<not-equals>
+							<property>/it-autoflight/output/fd2</property>
+							<value>1</value>
+						</not-equals>
+					</and>
+					<equals>
+						<property>/it-autoflight/output/lat</property>
+						<value>9</value>
+					</equals>
+				</or>
 			</condition>
 		</enable>
 		<input>/orientation/roll-deg</input>
@@ -181,26 +187,32 @@
 		<output>/it-autoflight/internal/target-roll</output>
 		<max-rate-of-change>
 			<condition>
-				<and>
-					<not-equals>
-						<property>/it-autoflight/output/ap1</property>
-						<value>1</value>
-					</not-equals>
-					<not-equals>
-						<property>/it-autoflight/output/ap2</property>
-						<value>1</value>
-					</not-equals>
-					<not-equals>
-						<property>/it-autoflight/output/fd1</property>
-						<value>1</value>
-					</not-equals>
-					<not-equals>
-						<property>/it-autoflight/output/fd2</property>
-						<value>1</value>
-					</not-equals>
-				</and>
+				<or>
+					<and>
+						<not-equals>
+							<property>/it-autoflight/output/ap1</property>
+							<value>1</value>
+						</not-equals>
+						<not-equals>
+							<property>/it-autoflight/output/ap2</property>
+							<value>1</value>
+						</not-equals>
+						<not-equals>
+							<property>/it-autoflight/output/fd1</property>
+							<value>1</value>
+						</not-equals>
+						<not-equals>
+							<property>/it-autoflight/output/fd2</property>
+							<value>1</value>
+						</not-equals>
+					</and>
+					<equals>
+						<property>/it-autoflight/output/lat</property>
+						<value>9</value>
+					</equals>
+				</or>
 			</condition>
-			<value>50</value>
+			<value>1000</value>
 		</max-rate-of-change>
 		<max-rate-of-change>
 			<condition>