diff --git a/BoardConfig.mk b/BoardConfig.mk
index 5ccba4b..47c1acc 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -172,6 +172,7 @@ RECOVERY_GRAPHICS_USE_LINELENGTH := true
 RECOVERY_SDCARD_ON_DATA := true
 HAVE_SELINUX := true
 BOARD_HAS_NO_MISC_PARTITION := true
+TARGET_RECOVERY_QCOM_RTC_FIX := true
 
 # Nfc
 BOARD_NFC_HAL_SUFFIX := w7
diff --git a/device_w7.mk b/device_w7.mk
index 2734a35..c1849a0 100644
--- a/device_w7.mk
+++ b/device_w7.mk
@@ -80,8 +80,8 @@ PRODUCT_COPY_FILES += \
     device/lge/w7/prebuilt/etc/sec_config:system/etc/sec_config \
     device/lge/w7/prebuilt/etc/izat.conf:system/etc/izat.conf \
     device/lge/w7/prebuilt/etc/boot_fixup:system/etc/boot_fixup \
-    device/lge/w7/prebuilt/etc/nfc-nci.conf:system/etc/nfc-nci.conf \
-    device/lge/w7/prebuilt/etc/nfcee_access.xml:system/etc/nfcee_access.xml\
+    device/lge/w7/prebuilt/etc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf \
+    device/lge/w7/prebuilt/etc/nfcee_access.xml:system/etc/nfcee_access.xml \
     device/lge/w7/prebuilt/etc/quipc.conf:system/etc/quipc.conf \
 
 # Ramdisk
diff --git a/prebuilt/etc/nfc-nci.conf b/prebuilt/etc/libnfc-brcm.conf
similarity index 100%
rename from prebuilt/etc/nfc-nci.conf
rename to prebuilt/etc/libnfc-brcm.conf
diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
index 75591dd..8814a58 100644
--- a/proprietary-blobs.txt
+++ b/proprietary-blobs.txt
@@ -5,30 +5,30 @@ vendor/lib/libtime_genoff.so
 vendor/lib/libTimeService.so
 
 # Firmwares
-vendor/etc/firmware/a225p5_pm4.fw
-vendor/etc/firmware/a225_pm4.fw
-vendor/etc/firmware/a300_pm4.fw
-vendor/etc/firmware/a330_pm4.fw
-vendor/etc/firmware/cpp_firmware_v1_1_6.fw
-vendor/etc/firmware/keymaster.b00
-vendor/etc/firmware/keymaster.b02
-vendor/etc/firmware/keymaster.mdt
-vendor/etc/firmware/leia_pm4_470.fw
-vendor/etc/firmware/venus.b01
-vendor/etc/firmware/venus.b03
-vendor/etc/firmware/venus.mbn
-vendor/etc/firmware/a225_pfp.fw
-vendor/etc/firmware/a300_pfp.fw
-vendor/etc/firmware/a330_pfp.fw
-vendor/etc/firmware/cpp_firmware_v1_1_1.fw
-vendor/etc/firmware/cpp_firmware_v1_2_0.fw
-vendor/etc/firmware/keymaster.b01
-vendor/etc/firmware/keymaster.b03
-vendor/etc/firmware/leia_pfp_470.fw
-vendor/etc/firmware/venus.b00
-vendor/etc/firmware/venus.b02
-vendor/etc/firmware/venus.b04
-vendor/etc/firmware/venus.mdt
+vendor/firmware/a225p5_pm4.fw
+vendor/firmware/a225_pm4.fw
+vendor/firmware/a300_pm4.fw
+vendor/firmware/a330_pm4.fw
+vendor/firmware/cpp_firmware_v1_1_6.fw
+vendor/firmware/keymaster.b00
+vendor/firmware/keymaster.b02
+vendor/firmware/keymaster.mdt
+vendor/firmware/leia_pm4_470.fw
+vendor/firmware/venus.b01
+vendor/firmware/venus.b03
+vendor/firmware/venus.mbn
+vendor/firmware/a225_pfp.fw
+vendor/firmware/a300_pfp.fw
+vendor/firmware/a330_pfp.fw
+vendor/firmware/cpp_firmware_v1_1_1.fw
+vendor/firmware/cpp_firmware_v1_2_0.fw
+vendor/firmware/keymaster.b01
+vendor/firmware/keymaster.b03
+vendor/firmware/leia_pfp_470.fw
+vendor/firmware/venus.b00
+vendor/firmware/venus.b02
+vendor/firmware/venus.b04
+vendor/firmware/venus.mdt
 
 # Audio
 etc/ACDB/Bluetooth_cal.acdb
@@ -243,9 +243,14 @@ vendor/lib/lib-rtpdaemoninterface.so
 vendor/lib/lib-rtpcommon.so
 vendor/lib/lib-dplmedia.so
 
+# IRDA
+bin/irrcServer
+lib/libirrc.so
+lib/libirrcClient.so
+lib/libirrcJni.so
+
 # We need it?
 -bin/port-bridge
--bin/irrcServer
 bin/riva_ramdump
 bin/imsdatadaemon
 bin/imsqmidaemon
@@ -256,5 +261,4 @@ vendor/lib/hw/flp.default.so
 vendor/lib/libdisp-aba.so
 vendor/lib/libcneapiclient.so
 lib/libcnefeatureconfig.so
-lib/libirrc.so
 lib/liblgewg.so
diff --git a/system.prop b/system.prop
index 45c1657..1cf427d 100644
--- a/system.prop
+++ b/system.prop
@@ -46,9 +46,6 @@ drm.service.enabled=true
 ro.lge.audio_soundexception=true
 ro.lge.audio_soundprofile=true
 persist.lg.data.autoprof.msim=true
-net.tethering.noprovisioning=true
-persist.lg.data.fd=-1
-persist.service.crash.enable=0
 audio.offload.disable=0
 
 log.tag.GpsLocationProvider=DEBUG
@@ -110,9 +107,6 @@ persist.audio.fluence.voicecall=false
 persist.audio.fluence.voicerec=false
 persist.audio.fluence.speaker=false
 
-# Reduce Background apps limit
-ro.sys.fw.bg_apps_limit=20
-
 # Enable/disable cabl
 ro.qualcomm.cabl=0
 
@@ -190,8 +184,4 @@ ro.build.sbp=1
 ro.lge.custLanguageSet=true
 ro.lge.dataprotect=1
 
-ro.qc.sdk.izat.premium_enabled=1
-ro.qc.sdk.izat.service_mask=0x0
-persist.gps.qc_nlp_in_use=0
-ro.gps.agps_provider=1
 ro.lge.proximity.delay=25