diff --git a/audio/tegu/audio-tables.mk b/audio/tegu/audio-tables.mk
index 3b2d324..552c217 100644
--- a/audio/tegu/audio-tables.mk
+++ b/audio/tegu/audio-tables.mk
@@ -33,7 +33,7 @@ PRODUCT_COPY_FILES += \
     device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml
 
 # Speaker firmware files
-SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/tas2572
+SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/tas2572/fw/
 SPK_FIRMWARE_FULL_PATH := device/google/tegu/audio/$(SPK_FIRMWARE_PATH)
 
 PRODUCT_COPY_FILES += $(call copy-files,$(wildcard  $(SPK_FIRMWARE_FULL_PATH)/*),$(TARGET_COPY_OUT_VENDOR)/firmware)
diff --git a/audio/tegu/tas2572/fw/ti_sp_tuning.bin b/audio/tegu/tas2572/fw/ti_sp_tuning.bin
new file mode 100644
index 0000000..1a3e33b
Binary files /dev/null and b/audio/tegu/tas2572/fw/ti_sp_tuning.bin differ
diff --git a/audio/tegu/tas2572/tismartpa_driver_tuning.bin b/audio/tegu/tas2572/fw/tismartpa_driver_tuning.bin
similarity index 100%
rename from audio/tegu/tas2572/tismartpa_driver_tuning.bin
rename to audio/tegu/tas2572/fw/tismartpa_driver_tuning.bin
diff --git a/device-tegu.mk b/device-tegu.mk
index 89ecdf6..539970c 100644
--- a/device-tegu.mk
+++ b/device-tegu.mk
@@ -30,6 +30,9 @@ $(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/devi
 $(call inherit-product-if-exists, vendor/google_devices/tegu/proprietary/tegu/device-vendor-tegu.mk)
 $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
 
+# display
+DEVICE_PACKAGE_OVERLAYS += device/google/tegu/tegu/overlay
+
 include device/google/tegu/audio/tegu/audio-tables.mk
 include device/google/zumapro/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
@@ -45,8 +48,6 @@ $(call soong_config_set,lyric,tuning_product,tegu)
 $(warning target_device set to zuma on zumapro target)
 $(call soong_config_set,google3a_config,target_device,tegu)
 
-# display
-DEVICE_PACKAGE_OVERLAYS += device/google/tegu/tegu/overlay
 
 # Init files
 PRODUCT_COPY_FILES += \
diff --git a/factory_tegu.mk b/factory_tegu.mk
index 063b388..993a60c 100644
--- a/factory_tegu.mk
+++ b/factory_tegu.mk
@@ -20,6 +20,9 @@ $(call inherit-product, device/google/zumapro/factory_common.mk)
 $(call inherit-product, device/google/tegu/device-tegu.mk)
 include device/google/tegu/audio/tegu/factory-audio-tables.mk
 
+# Factory binaries for GPS
+include device/google/tegu/location/factory-gnss.mk
+
 PRODUCT_NAME := factory_tegu
 PRODUCT_DEVICE := tegu
 PRODUCT_MODEL := Factory build on Tegu
diff --git a/location/factory-gnss.mk b/location/factory-gnss.mk
new file mode 100644
index 0000000..b3ffde6
--- /dev/null
+++ b/location/factory-gnss.mk
@@ -0,0 +1,3 @@
+# include factory gnss binaries
+include vendor/samsung_slsi/gps/s5300/gnss_factory.mk
+
diff --git a/tegu/overlay/frameworks/base/core/res/res/values/config.xml b/tegu/overlay/frameworks/base/core/res/res/values/config.xml
index d0af953..b668cde 100644
--- a/tegu/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tegu/overlay/frameworks/base/core/res/res/values/config.xml
@@ -50,7 +50,7 @@
     <integer name="config_defaultRefreshRate">0</integer>
 
     <!-- The default peak refresh rate. -->
-    <integer name="config_defaultPeakRefreshRate">120</integer>
+    <integer name="config_defaultPeakRefreshRate">60</integer>
 
     <!-- Not allow to switch to higher refresh rate when display brightness setting is
          equal or less than this value -->
@@ -255,7 +255,7 @@
     <integer name="config_stableDeviceDisplayHeight">2856</integer>
 
     <!-- The max vibration strength allowed in audio haptic channels. -->
-    <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
+    <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.32</item>
 
     <!-- Type of the udfps long press sensor. Empty if long press is not supported. -->
     <string name="config_dozeUdfpsLongPressSensorType" translatable="false">com.google.sensor.long_press</string>