diff --git a/configs/libnfc-nci.conf b/configs/libnfc-nci.conf
index eb6746fa8e42a3fe8198a92b92c96697af5f0cab..dadb0c4d213083de07126d3d1bdd36b9a5e053b6 100644
--- a/configs/libnfc-nci.conf
+++ b/configs/libnfc-nci.conf
@@ -362,6 +362,12 @@ AID_MATCHING_MODE=0x01
 
 NXP_PRFD_TECH_SE=0x02
 
+###############################################################################
+# Set max transceive length for IsoDep frames
+# Standard      0x105 (261)
+# Extended      0xFEFF (65279)
+ISO_DEP_MAX_TRANSCEIVE=0xFEFF
+
 ###############################################################################
 # Vendor Specific Proprietary Protocol & Discovery Configuration
 # Set to 0xFF if unsupported
@@ -374,4 +380,4 @@ NXP_PRFD_TECH_SE=0x02
 #  byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO
 #  byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME
 #  byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME
-NFA_PROPRIETARY_CFG={05:FF:FF:06:81:80:77:FF:FF}
\ No newline at end of file
+NFA_PROPRIETARY_CFG={05:FF:FF:06:81:80:77:FF:FF}
diff --git a/device.mk b/device.mk
index c73211a5645576b667bd783690921f2e28ef0dd9..fe78d837672a15508d186eba3e84516ae3491085 100644
--- a/device.mk
+++ b/device.mk
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2016 The CyanogenMod Project
-#               2017-2018 The LineageOS Project
+#               2017-2021 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ TARGET_SCREEN_WIDTH := 720
 
 # init
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/rootdir/bin/init.qcom.power.sh:system/bin/init.qcom.power.sh
+    $(LOCAL_PATH)/rootdir/bin/init.qcom.power.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/init.qcom.power.sh
 
 # Audio configuration
 PRODUCT_COPY_FILES += \
@@ -49,11 +49,11 @@ PRODUCT_COPY_FILES += \
 
 # Input
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/idc/clearpad.idc:system/usr/idc/clearpad.idc
+    $(LOCAL_PATH)/idc/clearpad.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/clearpad.idc
 
 # IRSC
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/sec_config:system/etc/sec_config
+    $(LOCAL_PATH)/configs/sec_config:$(TARGET_COPY_OUT_SYSTEM)/etc/sec_config
 
 # NFC configs
 PRODUCT_COPY_FILES += \
@@ -62,14 +62,14 @@ PRODUCT_COPY_FILES += \
 
 # RIL
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/dsi_config.xml:system/etc/data/dsi_config.xml \
-    $(LOCAL_PATH)/configs/netmgr_config.xml:system/etc/data/netmgr_config.xml \
-    $(LOCAL_PATH)/configs/qmi_config.xml:system/etc/data/qmi_config.xml
+    $(LOCAL_PATH)/configs/dsi_config.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/data/dsi_config.xml \
+    $(LOCAL_PATH)/configs/netmgr_config.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/data/netmgr_config.xml \
+    $(LOCAL_PATH)/configs/qmi_config.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/data/qmi_config.xml
 
 # Thermal
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/thermal-engine.conf:system/etc/thermal-engine.conf
+    $(LOCAL_PATH)/configs/thermal-engine.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/thermal-engine.conf
 
 # WLAN
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/wlan/bcmdhd.cal:system/etc/firmware/wlan/bcmdhd/bcmdhd.cal
+    $(LOCAL_PATH)/configs/wlan/bcmdhd.cal:$(TARGET_COPY_OUT_SYSTEM)/etc/firmware/wlan/bcmdhd/bcmdhd.cal
diff --git a/lineage_suzuran.mk b/lineage_suzuran.mk
index 92dd968c065222dad92e3e7964a34bdf77a2d422..ab5293b7b11b36a0c63d6b19da53b6e20d393079 100644
--- a/lineage_suzuran.mk
+++ b/lineage_suzuran.mk
@@ -28,7 +28,7 @@ PRODUCT_NAME := lineage_suzuran
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
     PRODUCT_NAME=suzuran \
-    PRIVATE_BUILD_DESC="E5823-user 7.1.1 32.4.A.1.54-3761073091 release-keys"
+    PRIVATE_BUILD_DESC="E5823-user 7.1.1 32.4.A.1.54 3761073091 release-keys"
 
 BUILD_FINGERPRINT := "Sony/E5823/E5823:7.1.1/32.4.A.1.54/3761073091:user/release-keys"