diff --git a/build/core/qcom_utils.mk b/build/core/qcom_utils.mk
index 866d31f..9ce4c59 100755
--- a/build/core/qcom_utils.mk
+++ b/build/core/qcom_utils.mk
@@ -25,6 +25,8 @@
 QCOM_BOARD_PLATFORMS += sdm845
 QCOM_BOARD_PLATFORMS += sm8150
 QCOM_BOARD_PLATFORMS += msmnile
+QCOM_BOARD_PLATFORMS += kona
+QCOM_BOARD_PLATFORMS += sm8250
 
 MSM7K_BOARD_PLATFORMS := msm7630_surf
 MSM7K_BOARD_PLATFORMS += msm7630_fusion
diff --git a/build/vendor_hal_makefile_generator.sh b/build/vendor_hal_makefile_generator.sh
index 8e11f3c..41a81f9 100755
--- a/build/vendor_hal_makefile_generator.sh
+++ b/build/vendor_hal_makefile_generator.sh
@@ -91,7 +91,7 @@
         hal_package=${hal_package%?}
 
         #Check if we already executed hidl-gen for a given package
-        if ${ECHO} "${package_collection[@]}" | ${GREP} $hal_package > /dev/null; then
+        if ${ECHO} "${package_collection[@]}" | ${GREP} -w $hal_package > /dev/null; then
             continue;
         else
             package_collection+=($hal_package)
@@ -120,7 +120,7 @@
         ${TOUCH} $hal_path/.hidl-autogen
 
         ${ECHO} -n "Running hidl-gen on $hal_package: "
-        hidl-gen -Landroidbp $root_arguments $hal_package;
+        hidl-gen -O qcom -Landroidbp $root_arguments $hal_package;
         rc=$?; if [[ $rc != 0 ]]; then return $rc; fi
 
         if [ "$update_check" -eq 1 ]; then
@@ -149,7 +149,7 @@
         local relative_interface=${interface#${ANDROID_BUILD_TOP}/}
         generate_make_files $relative_interface "android.hidl:system/libhidl/transport"
         if [ $? -ne 0 ] ; then
-           ${ECHO} "HIDL interfaces: FATAL !!!! Update Failed: HAL File not compatible"
+           ${ECHO} "HIDL interfaces: Update Failed"
            return 1;
         fi
     done