diff --git a/device-common.mk b/device-common.mk
index 971e9b7..c61fc04 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -432,7 +432,7 @@
 
 # NFC and Secure Element packages
 PRODUCT_PACKAGES += \
-    com.android.nfcservices \
+    NfcNci \
     Tag \
     SecureElement \
     android.hardware.nfc-service.st \
@@ -1031,7 +1031,7 @@
 -include hardware/google/pixel/pixelstats/device.mk
 
 # thermal
--include hardware/google/pixel/thermal/device.mk
+include device/google/gs-common/thermal/thermal_hal/device.mk
 
 # power HAL
 -include hardware/google/pixel/power-libperfmgr/aidl/device.mk
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 2401dd7..5860544 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -222,7 +222,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.wifi_ext</name>
-        <version>1</version>
+        <version>2-3</version>
         <interface>
             <name>IWifiExt</name>
             <instance>default</instance>