diff --git a/missions/avcl/SailorOverboard3.1.xml b/missions/avcl/SailorOverboard3.1.xml
index 646314f8bbaedad129edabcc1dbb3c27ee86e0e4..117f606e1f3f4c3ec012c5e07ad4be2dd874f2b7 100644
--- a/missions/avcl/SailorOverboard3.1.xml
+++ b/missions/avcl/SailorOverboard3.1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AVCL version="3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../schemas/AVCL.3.1.xsd">
+<AVCL version="3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://savage.nps.edu/EthicalControl/schemas/AVCL.3.1.xsd">
 	<head>
 		<meta name="title" content="SailorOverboard3.1.xml"/>
 		<meta name="description" content="AVCL mission to perform SAILOR OVERBOARD operations, carried out in concert with shipboard emergency procedures. Test mission for AVCL revision version 3.1."/>
diff --git a/missions/avcl/TCE22-2MemsAcousticVectorSensorTesting.xml b/missions/avcl/TCE22-2MemsAcousticVectorSensorTesting.xml
index 20db3c345cf41ae3159eb51273559c2673701e3e..7b730f332867cdf30a39a342381b8c502cf94293 100644
--- a/missions/avcl/TCE22-2MemsAcousticVectorSensorTesting.xml
+++ b/missions/avcl/TCE22-2MemsAcousticVectorSensorTesting.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AVCL version="3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../schemas/AVCL.3.1.xsd">
+<AVCL version="3.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://savage.nps.edu/EthicalControl/schemas/AVCL.3.1.xsd">
 	<head>
 		<meta name="title" content="TCE22-2MemsAcousticVectorSensorTesting.xml"/>
 		<meta name="description" content="NPS MEMS Acoustic Sensor TCE mission.  Participation Plan and Objectives. OBJ 1: Evaluate performance of MEMS acoustic vector sensor for detecting underwater and aerial vehicles or targets.Record acoustic signature of several sources (eg.UUVs, ROVs, Boats, UAVs, UAS, etc.). OBJ 2: Evaluate the capability of determining bearing to targets and how accurate are the bearings. Compare sensor provided bearings with the actual (controlled experiments).  OBJ 3: Evaluate the survivability of the sensors in the field (Air and Underwater)."/>
@@ -45,16 +45,13 @@
 					<Reposition description="Leave dock, proceed to basin"/>
 					<!-- TODO Risk personnel clear -->
 				</Goal>
-				<Goal id="Goal2" title="Perform racetrack in Delmar Boat Basin" description="Provide acoustic signals to MEMS sensor" phase="Patrol" nextOnSuccess="Goal3" nextOnFailure="Goal3" nextOnException="Goal3">
+				<Goal id="Goal2" title="Perform racetrack in Delmar Boat Basin" description="Provide acoustic signals to MEMS sensor" phase="Patrol" 
+				      nextOnSuccess="Goal3" nextOnFailure="Goal3" nextOnException="Goal3">
 					<Search datumType="area" requiredPD="0.5">
 						<Target name="Orbit using long rectangular track" id="Racetrack"/>
 					</Search>
 					<Risk riskName="RE11.4.1_UnderstandingReasoningMethodsLimitations" mitigation="watchstander training" mandatory="true"/>
-					<OperatingArea>
-						<Point>
-							<LatitudeLongitude latitude="0" longitude="0"/>
-						</Point>
-					</OperatingArea>
+					<OperatingArea refid="NpsMemsOperatingArea"/>
 					<Duration value="6000"/>
 				</Goal>
 				<Goal id="Goal3" title="Return and recover" description="Land on dock" phase="Recover">