diff --git a/ResearchKit/Common/ORKAnswerFormat.m b/ResearchKit/Common/ORKAnswerFormat.m
index a1c976e03..ca3b5da54 100644
--- a/ResearchKit/Common/ORKAnswerFormat.m
+++ b/ResearchKit/Common/ORKAnswerFormat.m
@@ -488,7 +488,7 @@ + (ORKWeightAnswerFormat *)weightAnswerFormatWithMeasurementSystem:(ORKMeasureme
                                                        defaultValue:defaultValue];
 }
 
-#if ORK_FEATURE_CLLOCATIONMANAGER_AUTHORIZATION && TARGET_OS_IOS
+#if ORK_FEATURE_CLLOCATIONMANAGER_AUTHORIZATION && TARGET_OS_IOS && !TARGET_OS_VISION
 + (ORKLocationAnswerFormat *)locationAnswerFormat {
     return [ORKLocationAnswerFormat new];
 }
@@ -502,14 +502,6 @@ + (ORKSESAnswerFormat *)socioEconomicAnswerFormatWithTopRungText:(NSString *)top
 
 #endif
 
-#if !TARGET_OS_VISION
-
-+ (ORKLocationAnswerFormat *)locationAnswerFormat {
-    return [ORKLocationAnswerFormat new];
-}
-
-#endif
-
 + (ORKBooleanAnswerFormat *)booleanAnswerFormat {
     return [ORKBooleanAnswerFormat new];
 }
diff --git a/Sources/ResearchKitSwiftUIBridge/ORKOrderedTaskView.swift b/Sources/ResearchKitSwiftUIBridge/ORKOrderedTaskView.swift
index e4cdbca27..8837edd98 100644
--- a/Sources/ResearchKitSwiftUIBridge/ORKOrderedTaskView.swift
+++ b/Sources/ResearchKitSwiftUIBridge/ORKOrderedTaskView.swift
@@ -190,7 +190,8 @@ public struct ORKOrderedTaskView: UIViewControllerRepresentable {
     ///   - shouldConfirmCancel: Specifies the behavior of the "Cancel" button if it should ask for confirmation. The button is always presented.
     ///   - result: A closure receiving the ``TaskResult`` for the task view.
     @available(*, deprecated, message: "Use init(tasks:tintColor:cancelBehavior:result:) instead")
-    public init( // swiftlint:disable:this function_default_parameter_at_end
+    // swiftlint:disable:next function_default_parameter_at_end
+    public init(
         tasks: ORKOrderedTask,
         tintColor: Color = Color(UIColor(named: "AccentColor") ?? .systemBlue),
         shouldConfirmCancel: Bool,