diff --git a/swift/ql/integration-tests/osx/hello-xcode/Files.ql b/swift/ql/integration-tests/osx/hello-xcode/Files.ql
index 0ef878215647..1151ff0bb9b0 100644
--- a/swift/ql/integration-tests/osx/hello-xcode/Files.ql
+++ b/swift/ql/integration-tests/osx/hello-xcode/Files.ql
@@ -1,5 +1,7 @@
 import swift
 
 from File f
-where exists(f.getRelativePath()) or f instanceof UnknownFile
+where
+  (exists(f.getRelativePath()) or f instanceof UnknownFile) and
+  not f.getBaseName() = "<module-includes>"
 select f
diff --git a/swift/tools/tracing-config.lua b/swift/tools/tracing-config.lua
index a29e7b3b9536..22ce71b2e78e 100644
--- a/swift/tools/tracing-config.lua
+++ b/swift/tools/tracing-config.lua
@@ -54,6 +54,8 @@ function RegisterExtractorPack(id)
         strip_unsupported_arg(args, '-experimental-skip-non-inlinable-function-bodies-without-types', 0)
         strip_unsupported_clang_arg(args, '-ivfsstatcache', 1)
         strip_unsupported_clang_arg(args, '-fno-odr-hash-protocols', 0)
+        strip_unsupported_clang_arg(args, '-fobjc-msgsend-selector-stubs', 0)
+        strip_unsupported_clang_arg(args, '-fstack-check', 0)
         strip_unsupported_clang_arg(args, '-clang-vendor-feature=+disableNonDependentMemberExprInCurrentInstantiation', 0)
         strip_unsupported_clang_arg(args, '-clang-vendor-feature=+enableAggressiveVLAFolding', 0)
         strip_unsupported_clang_arg(args, '-clang-vendor-feature=+revert09abecef7bbf', 0)