diff --git a/Patches/LineageOS-19.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch b/Patches/LineageOS-19.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch
index b7322f4c..07153294 100644
--- a/Patches/LineageOS-19.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch
+++ b/Patches/LineageOS-19.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch
@@ -76,7 +76,7 @@ index a3ee437..c4532c5 100644
           The array should be sorted in the same order as the
           touchscreen gestures advertised by the device's LineageHW impl. -->
 diff --git a/res/values/strings.xml b/res/values/strings.xml
-index 0915dfd..a2d4d45 100644
+index a673536..f98c2b0 100644
 --- a/res/values/strings.xml
 +++ b/res/values/strings.xml
 @@ -532,28 +532,6 @@
@@ -125,12 +125,12 @@ index 803b214..371382c 100644
            android:title="@string/power_menu_title"
            android:fragment="org.lineageos.lineageparts.input.PowerMenuActions"
 diff --git a/res/xml/trust_preferences.xml b/res/xml/trust_preferences.xml
-index bdb1aa7..0097a52 100644
+index 108371c..3b89030 100644
 --- a/res/xml/trust_preferences.xml
 +++ b/res/xml/trust_preferences.xml
-@@ -45,9 +45,6 @@
-             android:summary="@string/trust_restrict_usb_summary"
-             android:defaultValue="false" />
+@@ -47,9 +47,6 @@
+             android:entryValues="@array/trust_restrict_usb_values"
+             android:defaultValue="0" />
  
 -        <org.lineageos.internal.lineageparts.LineagePartsPreference
 -            android:key="lineagestats" />
diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh
index 3fdb9976..a3d97911 100644
--- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh
+++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh
@@ -54,19 +54,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0010.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0011.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1353/^5.17/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1516/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20009/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch
-editKernelLocalversion "-dos.p68"
+editKernelLocalversion "-dos.p66"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh
index 409be326..bd6636f5 100644
--- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh
+++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh
@@ -43,14 +43,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3625/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0935/4.9/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0941/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1941/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1945/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35084/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39792/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0435/4.4/0008.patch
@@ -76,5 +74,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch
-editKernelLocalversion "-dos.p76"
+editKernelLocalversion "-dos.p74"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh
index 7d07a5e1..70c8df8e 100644
--- a/Scripts/LineageOS-19.1/Functions.sh
+++ b/Scripts/LineageOS-19.1/Functions.sh
@@ -60,8 +60,8 @@ buildAll() {
 	buildDevice discovery;
 	#SD835
 	buildDevice cheryl verity;
-	#buildDevice cheeseburger verity; #unb, radio broken pending upstream merge
-	#buildDevice dumpling verity;
+	buildDevice cheeseburger verity; #unb
+	buildDevice dumpling verity;
 	buildDevice mata verity;
 	buildDevice taimen avb;
 	buildDevice walleye avb;
@@ -97,7 +97,9 @@ patchWorkspace() {
 	touch DOS_PATCHED_FLAG;
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
 
-	#source build/envsetup.sh;
+	source build/envsetup.sh;
+	repopick -i 326739; #Trust: Add option to always disable USB gadgets
+	repopick -i 327531; #msm8998-common: sepolicy: update rild access to vendor_data_file
 
 	sh "$DOS_SCRIPTS/Patch.sh";
 	sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh
index 63365773..5bdc8d08 100644
--- a/Scripts/LineageOS-19.1/Patch.sh
+++ b/Scripts/LineageOS-19.1/Patch.sh
@@ -404,6 +404,10 @@ sed -i '/PRODUCT_SYSTEM_VERITY_PARTITION/iPRODUCT_VENDOR_VERITY_PARTITION := /de
 awk -i inplace '!/vendor_sensors_dbg_prop/' sepolicy/vendor/hal_camera_default.te; #fixup
 fi;
 
+if enterAndClear "device/oneplus/sdm845-common"; then
+sed -i 's/zramsize=1073741824/zramsize=2147483648,max_comp_streams=8/' rootdir/etc/fstab.qcom;
+fi
+
 if enterAndClear "kernel/google/wahoo"; then
 sed -i 's/asm(SET_PSTATE_UAO(1));/asm(SET_PSTATE_UAO(1)); return 0;/' arch/arm64/mm/fault.c; #fix build with CONFIG_ARM64_UAO
 fi;