diff --git a/XPMP2-Sample.xcodeproj/project.pbxproj b/XPMP2-Sample.xcodeproj/project.pbxproj
index b420222..897920c 100644
--- a/XPMP2-Sample.xcodeproj/project.pbxproj
+++ b/XPMP2-Sample.xcodeproj/project.pbxproj
@@ -245,7 +245,7 @@
 				CURRENT_PROJECT_VERSION = 3.1.0;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DSTROOT = "$(XPLANE11_ROOT)/Resources/plugins/$(PROJECT)";
+				DSTROOT = "$(XPLANE_ROOT)/Resources/plugins/$(PROJECT)";
 				DYLIB_COMPATIBILITY_VERSION = "";
 				DYLIB_CURRENT_VERSION = "";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -310,7 +310,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.twinfan.XPMP2-Sample";
 				PRODUCT_NAME = "${TARGET_NAME}";
 				SDKROOT = macosx;
-				XPLANE11_ROOT = "$(USER_APPS_DIR)/X-Plane/11";
+				XPLANE_ROOT = "$(USER_APPS_DIR)/X-Plane/12";
 			};
 			name = Debug;
 		};
@@ -350,7 +350,7 @@
 				CURRENT_PROJECT_VERSION = 3.1.0;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DSTROOT = "$(XPLANE11_ROOT)/Resources/plugins/$(PROJECT)";
+				DSTROOT = "$(XPLANE_ROOT)/Resources/plugins/$(PROJECT)";
 				DYLIB_COMPATIBILITY_VERSION = "";
 				DYLIB_CURRENT_VERSION = "";
 				ENABLE_NS_ASSERTIONS = NO;
@@ -413,7 +413,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.twinfan.XPMP2-Sample";
 				PRODUCT_NAME = "${TARGET_NAME}";
 				SDKROOT = macosx;
-				XPLANE11_ROOT = "$(USER_APPS_DIR)/X-Plane/11";
+				XPLANE_ROOT = "$(USER_APPS_DIR)/X-Plane/12";
 			};
 			name = Release;
 		};
@@ -424,7 +424,6 @@
 				DEAD_CODE_STRIPPING = YES;
 				DEPLOYMENT_LOCATION = YES;
 				INSTALL_PATH = mac_x64;
-				VALID_ARCHS = x86_64;
 			};
 			name = Debug;
 		};
@@ -435,7 +434,6 @@
 				DEAD_CODE_STRIPPING = YES;
 				DEPLOYMENT_LOCATION = YES;
 				INSTALL_PATH = mac_x64;
-				VALID_ARCHS = x86_64;
 			};
 			name = Release;
 		};
diff --git a/XPMP2-Sample.xcodeproj/xcshareddata/xcschemes/XPMP2-Sample.xcscheme b/XPMP2-Sample.xcodeproj/xcshareddata/xcschemes/XPMP2-Sample.xcscheme
index 9186b57..b2e09e5 100644
--- a/XPMP2-Sample.xcodeproj/xcshareddata/xcschemes/XPMP2-Sample.xcscheme
+++ b/XPMP2-Sample.xcodeproj/xcshareddata/xcschemes/XPMP2-Sample.xcscheme
@@ -42,7 +42,7 @@
       allowLocationSimulation = "YES">
       <PathRunnable
          runnableDebuggingMode = "0"
-         FilePath = "/Users/birger/Applications/X-Plane/11/X-Plane.app">
+         FilePath = "/Users/birger/Applications/X-Plane/12/X-Plane.app">
       </PathRunnable>
    </LaunchAction>
    <ProfileAction
diff --git a/lib/XPMP2 b/lib/XPMP2
index 280e5d6..2c1377a 160000
--- a/lib/XPMP2
+++ b/lib/XPMP2
@@ -1 +1 @@
-Subproject commit 280e5d64b7b56d2c088fed703f2edbd2b4bc0054
+Subproject commit 2c1377a21967fb4b3157d836d8317cabca6b4cc4