diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk
index 27e01f5..723f2a5 100644
--- a/universal7885-common/BoardConfigCommon.mk
+++ b/universal7885-common/BoardConfigCommon.mk
@@ -50,9 +50,6 @@ BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 # Fingerprint
 TARGET_SEC_FP_HAS_FINGERPRINT_GESTURES := true
 
-# Include
-TARGET_SPECIFIC_HEADER_PATH := $(COMMON_PATH)/include
-
 # Init
 TARGET_INIT_VENDOR_LIB := //$(COMMON_PATH):libinit_universal7885
 
diff --git a/universal7885-common/aptx/libaptXHD_encoder.so b/universal7885-common/aptx/libaptXHD_encoder.so
deleted file mode 100644
index 7290757..0000000
Binary files a/universal7885-common/aptx/libaptXHD_encoder.so and /dev/null differ
diff --git a/universal7885-common/aptx/libaptX_encoder.so b/universal7885-common/aptx/libaptX_encoder.so
deleted file mode 100644
index 9dce57e..0000000
Binary files a/universal7885-common/aptx/libaptX_encoder.so and /dev/null differ
diff --git a/universal7885-common/init/init_universal7885.cpp b/universal7885-common/init/init_universal7885.cpp
index 8556997..78b5fb4 100644
--- a/universal7885-common/init/init_universal7885.cpp
+++ b/universal7885-common/init/init_universal7885.cpp
@@ -87,7 +87,7 @@ void vendor_load_properties() {
         model = GetProperty("ro.boot.em.model", "");
     }
 
-    if (hasEnding(model, "N") || hasEnding(model, "S") || hasEnding(model, "K")) {
+    if (hasEnding(model, "N") || hasEnding(model, "S") || hasEnding(model, "K") || model == "SM-A202F") {
     	property_override("ro.boot.product.hardware.sku", "NFC");
     }
 
diff --git a/universal7885-common/sepolicy/vendor/file_contexts b/universal7885-common/sepolicy/vendor/file_contexts
index 1a465a9..57a9a6d 100644
--- a/universal7885-common/sepolicy/vendor/file_contexts
+++ b/universal7885-common/sepolicy/vendor/file_contexts
@@ -225,7 +225,7 @@
 
 # Thermal
 /(vendor|system/vendor)/bin/hw/android\.hardware\.thermal@2\.0-service\.pixel                     u:object_r:hal_thermal_default_exec:s0
-/dev/thermal/(/.*)?										u:object_r:thermal_link_device:s0
+/dev/thermal(/.*)?										u:object_r:thermal_link_device:s0
 /vendor/bin/thermal_symlinks                                                      u:object_r:init-thermal-symlinks-sh_exec:s0
 
 # SamsungParts
diff --git a/universal7885-common/sepolicy/vendor/init-thermal-symlinks.sh.te b/universal7885-common/sepolicy/vendor/init-thermal-symlinks.sh.te
index 941223b..4ed667a 100644
--- a/universal7885-common/sepolicy/vendor/init-thermal-symlinks.sh.te
+++ b/universal7885-common/sepolicy/vendor/init-thermal-symlinks.sh.te
@@ -8,3 +8,4 @@ allow init-thermal-symlinks-sh sysfs_thermal:dir r_dir_perms;
 allow init-thermal-symlinks-sh sysfs_thermal:file r_file_perms;
 allow init-thermal-symlinks-sh sysfs_thermal:lnk_file r_file_perms;
 set_prop(init-thermal-symlinks-sh, vendor_thermal_prop)
+allow init-thermal-symlinks-sh sysfs_virtual:dir search;
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 6c479fc..1c83378 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -30,11 +30,6 @@ PRODUCT_PACKAGES += \
     libtinycompress \
     audio.hearing_aid.default
 
-# Aptx    
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/aptx/libaptX_encoder.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libaptX_encoder.so \
-    $(LOCAL_PATH)/aptx/libaptXHD_encoder.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libaptXHD_encoder.so 
-    
 # Audio Configs    
 PRODUCT_COPY_FILES += \
     frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \