diff --git a/device-comet.mk b/device-comet.mk
index b404f30..d9ae732 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -15,9 +15,11 @@
 #
 
 TARGET_KERNEL_DIR ?= device/google/comet-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/comet-kernel/kernel-headers
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/comet-kernel/kernel-headers
 TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT
 
+LOCAL_PATH := device/google/comet
+
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
     USE_UWBFIELDTESTQM := true
 endif
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 0d08f6a..77f008c 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -7,7 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1
 gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
-ism_stream_enable=1
+ism_stream_enable=0
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 MaxNtnRefLocAgeSecs=600
 GlueLayer_IsPlatformRefTimeEnable=1
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 647eae6..4b69545 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -21,7 +21,7 @@ gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 
 # enable ism stream for GAAM
-ism_stream_enable=1
+ism_stream_enable=0
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 
 MaxNtnRefLocAgeSecs=600