diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh
index cf6b0d74..65489a57 100644
--- a/Scripts/Common/Functions.sh
+++ b/Scripts/Common/Functions.sh
@@ -711,7 +711,8 @@ hardenDefconfig() {
 	optionsYes+=("THREAD_INFO_IN_TASK" "VMAP_STACK");
 
 	#Linux 4.10
-	optionsYes+=("ARM64_SW_TTBR0_PAN" "BUG_ON_DATA_CORRUPTION");
+	optionsYes+=("ARM64_SW_TTBR0_PAN");
+	#Disabled: BUG_ON_DATA_CORRUPTION (boot issues?)
 
 	#Linux 4.11
 	optionsYes+=("STRICT_KERNEL_RWX" "STRICT_MODULE_RWX");
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index 90cc68c2..6efdb538 100644
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -360,6 +360,7 @@ fi;
 
 if enterAndClear "device/samsung/toroplus"; then
 awk -i inplace '!/additional_system_update/' overlay/packages/apps/Settings/res/values*/*.xml;
+awk -i inplace '!/has_powercontrol_widget/' overlay/packages/apps/Settings/res/values/bools.xml; #Fix Settings crash
 fi;
 
 if enterAndClear "device/samsung/tuna"; then
@@ -373,6 +374,7 @@ patch -p1 < "$DOS_PATCHES/android_device_samsung_tuna/0003-fix_denial.patch";
 patch -p1 < "$DOS_PATCHES/android_device_samsung_tuna/0004-fix_denial.patch";
 patch -p1 < "$DOS_PATCHES/android_device_samsung_tuna/0005-fix_denial.patch";
 echo "allow system_server system_file:file execmod;" >> sepolicy/system_server.te; #fix gps load
+echo "PRODUCT_PROPERTY_OVERRIDES += persist.sys.force_highendgfx=true" >> device.mk; #override low_ram to fix artifacting
 fi;
 
 if enter "vendor/google"; then