diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk
index aba9799..d41e086 100644
--- a/bluetooth/qti_default.mk
+++ b/bluetooth/qti_default.mk
@@ -27,7 +27,7 @@ TARGET_BLUETOOTH_HCI_V1_1 = true
 TARGET_BLUETOOTH_UART_DEVICE = "/dev/ttySAC18"
 UART_USE_TERMIOS_AFC = true
 TARGET_USE_QTI_BT_IBS = false
-TARGET_USE_QTI_BT_OBS = true
+TARGET_USE_QTI_BT_OBS = false
 TARGET_USE_QTI_BT_SAR = true
 TARGET_USE_QTI_BT_CHANNEL_AVOIDANCE = true
 ifeq ($(TARGET_BLUETOOTH_HCI_V1_1),true)
diff --git a/board-info.txt b/board-info.txt
index 2fd6143..d737bec 100644
--- a/board-info.txt
+++ b/board-info.txt
@@ -1 +1,2 @@
 require board=lynx
+require partition-exists=vendor_kernel_boot
diff --git a/manifest.xml b/manifest.xml
index 4d4f0f8..6688f36 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -122,15 +122,6 @@
        <transport>hwbinder</transport>
        <fqname>@1.3::IDevice/google-edgetpu</fqname>
     </hal>
-    <hal format="hidl">
-       <name>android.hardware.nfc</name>
-       <transport>hwbinder</transport>
-       <version>1.2</version>
-       <interface>
-           <name>INfc</name>
-           <instance>default</instance>
-       </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.health</name>
         <transport>hwbinder</transport>