diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh
index bcde108f..c4edc003 100755
--- a/Scripts/Common/Deblob.sh
+++ b/Scripts/Common/Deblob.sh
@@ -289,10 +289,8 @@ echo "Deblobbing..."
 deblobDevice() {
 	devicePath="$1";
 	cd "$DOS_BUILD_BASE$devicePath";
-	if [ "${PWD##*/}" == "flo" ] || [ "${PWD##*/}" == "mako" ] || [ "${PWD##*/}" == "kona-common" ] || [ "${PWD##*/}" == "n5110" ] || [ "${PWD##*/}" == "smdk4412-common" ] || [ "${PWD##*/}" == "hdx-common" ] || [ "${PWD##*/}" == "thor" ] || [ "${PWD##*/}" == "flounder" ]; then #Some devices don't need/like TimeKeep
-		replaceTime="false";
-	fi;
-	if [ "$DOS_DEBLOBBER_REPLACE_TIME" = false ]; then replaceTime="false"; fi; #Disable replacement
+	if [ "$DOS_DEBLOBBER_REPLACE_TIME" = false ]; then replaceTime="false"; fi; #Disable Time replacement
+	if ! grep -qi "qcom" BoardConfig*.mk; then replaceTime="false"; fi; #Disable Time Replacement
 	if [ -f Android.mk ]; then
 		#Some devices store these in a dedicated firmware partition, others in /system/vendor/firmware, either way the following are just symlinks
 		#sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(CMN_SYMLINKS)//' Android.mk; #Remove CMN firmware
@@ -398,12 +396,18 @@ deblobDevice() {
 	fi;
 	if [ -d sepolicy ]; then
 		if [ -z "$replaceTime" ]; then
+			numfiles=(*); numfiles=${#numfiles[@]};
+			if [ "$numfiles"  -gt "5" ]; then #only if device doesn't use a common sepolicy dir
 			#Switch to Sony TimeKeep
 			echo "allow system_app time_data_file:dir { create_dir_perms search };" >> sepolicy/system_app.te;
 			echo "allow system_app time_data_file:file create_file_perms;" >> sepolicy/system_app.te;
+			fi;
 		fi;
 	fi;
-	if [ -z "$replaceTime" ]; then sed -i 's|service time_daemon /system/bin/time_daemon|service timekeep /system/bin/timekeep restore\n    oneshot|' init.*.rc rootdir/init.*.rc rootdir/etc/init.*.rc &> /dev/null || true; fi; #Switch to Sony TimeKeep
+	if [ -z "$replaceTime" ]; then #Switch to Sony TimeKeep
+		sed -i 's|service time_daemon /system/bin/time_daemon|service time_daemon /system/bin/timekeep restore\n    oneshot|' init.*.rc rootdir/init.*.rc rootdir/etc/init.*.rc &> /dev/null || true;
+		sed -i 's|mkdir /data/time/ 0700 system system|mkdir /data/time/ 0700 system system\n    chmod 0770 /data/time/ats_2|' init.*.rc rootdir/init.*.rc rootdir/etc/init.*.rc &> /dev/null || true;
+	fi;
 	rm -f board/qcom-cne.mk product/qcom-cne.mk; #Remove CNE
 	rm -f rootdir/etc/init.qti.ims.sh rootdir/init.qti.ims.sh init.qti.ims.sh; #Remove IMS startup script
 	rm -rf IMSEnabler; #Remove IMS compatibility module
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh
index 4b1c58fd..8172ecf8 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh
@@ -42,7 +42,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8481/ANY/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9576/3.10/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0457/3.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0524/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0648/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
@@ -54,21 +53,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.10/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13246/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15845/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/^4.13/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/^4.13/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16534/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16537/^4.13/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/^4.13/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/^4.13/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16643/3.5+/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17558/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5972/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6345/^4.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/^4.9/0001.patch
@@ -76,11 +71,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7533/3.10/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7541/3.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p82"
+editKernelLocalversion "-dos.p76"
 cd "$DOS_BUILD_BASE"