diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 52dd08ce..3e1ccafa 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -718,7 +718,6 @@ on property:sys.boot_completed=1
     setprop vendor.powerhal.init 1
 
     # Setup final cpu.uclamp
-    write /proc/vendor_sched/uclamp_threshold 8
     write /proc/vendor_sched/ta_uclamp_min 1
     write /proc/vendor_sched/fg_uclamp_min 0
     write /proc/vendor_sched/sys_prefer_idle 0
diff --git a/device.mk b/device.mk
index 27ca987d..d2930c3d 100644
--- a/device.mk
+++ b/device.mk
@@ -533,7 +533,7 @@ endif
 
 # WiFi
 PRODUCT_PACKAGES += \
-	android.hardware.wifi@1.0-service \
+	android.hardware.wifi-service \
 	wificond \
 	libwpa_client \
 	WifiOverlay \
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index d170208d..14b43a18 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -135,9 +135,9 @@
            <instance>default</instance>
        </interface>
     </hal>
-    <hal format="hidl" optional="true">
+    <hal format="aidl" optional="true">
         <name>vendor.google.wifi_ext</name>
-        <version>1.3</version>
+        <version>1</version>
         <interface>
             <name>IWifiExt</name>
             <instance>default</instance>