diff --git a/app-core/src/main/java/com/topjohnwu/magisk/App.java b/app-core/src/main/java/com/topjohnwu/magisk/App.java
index 5d63f0b5e..205baaee7 100644
--- a/app-core/src/main/java/com/topjohnwu/magisk/App.java
+++ b/app-core/src/main/java/com/topjohnwu/magisk/App.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.preference.PreferenceManager;
 
 import com.topjohnwu.magisk.core.BuildConfig;
@@ -40,9 +41,13 @@ public class App extends Application {
         super.attachBaseContext(base);
         self = this;
 
-        prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        Context de = this;
+        if (Build.VERSION.SDK_INT >= 24) {
+            de = createDeviceProtectedStorageContext();
+            de.moveSharedPreferencesFrom(this, PreferenceManager.getDefaultSharedPreferencesName(base));
+        }
+        prefs = PreferenceManager.getDefaultSharedPreferences(de);
         mDB = new MagiskDB(this);
-        repoDB = new RepoDatabaseHelper(this);
 
         Networking.init(this);
         LocaleManager.setLocale(this);
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java b/app-core/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java
index 75c3ab9d2..7e74ded31 100644
--- a/app-core/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java
+++ b/app-core/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java
@@ -8,7 +8,6 @@ import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.container.TarEntry;
-import com.topjohnwu.magisk.core.R;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.net.DownloadProgressListener;
 import com.topjohnwu.net.Networking;
diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml
index 3b61d54e9..1bd8a99e9 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -5,13 +5,12 @@
 
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
         android:name="a.e"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning">
+        tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
 
         <!-- Activities -->
 
@@ -39,14 +38,17 @@
 
         <activity
             android:name="a.m"
+            android:directBootAware="true"
             android:excludeFromRecents="true"
             android:launchMode="singleTask"
-            android:taskAffinity="internal.superuser"
+            android:taskAffinity="a.m"
             android:theme="@style/SuRequest" />
 
         <!-- Receiver -->
 
-        <receiver android:name="a.h">
+        <receiver
+            android:name="a.h"
+            android:directBootAware="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
@@ -54,13 +56,14 @@
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
                 <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
+
                 <data android:scheme="package" />
             </intent-filter>
         </receiver>
 
         <!-- Service -->
 
-        <service android:name="a.j"/>
+        <service android:name="a.j" />
 
         <!-- Hardcode GMS version -->
         <meta-data
diff --git a/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java b/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java
index fdc400842..c91b290f5 100644
--- a/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java
+++ b/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java
@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.text.TextUtils;
 
 import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.database.RepoDatabaseHelper;
 import com.topjohnwu.magisk.tasks.UpdateRepos;
 import com.topjohnwu.magisk.uicomponents.Notifications;
 import com.topjohnwu.magisk.uicomponents.Shortcuts;
@@ -67,6 +68,9 @@ public class SplashActivity extends BaseActivity {
         // Setup shortcuts
         Shortcuts.setup(this);
 
+        // Create repo database
+        app.repoDB = new RepoDatabaseHelper(this);
+
         // Magisk working as expected
         if (Shell.rootAccess() && Config.magiskVersionCode > 0) {
             // Load modules
diff --git a/app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java b/app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java
index 4dec0471f..52cfec56e 100644
--- a/app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java
+++ b/app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java
@@ -21,6 +21,7 @@ import com.topjohnwu.magisk.components.BaseActivity;
 import com.topjohnwu.magisk.container.Policy;
 import com.topjohnwu.magisk.utils.FingerprintHelper;
 import com.topjohnwu.magisk.utils.SuConnector;
+import com.topjohnwu.magisk.utils.Utils;
 
 import java.io.IOException;
 
@@ -75,7 +76,7 @@ public class SuRequestActivity extends BaseActivity {
 
         PackageManager pm = getPackageManager();
         app.mDB.clearOutdated();
-        timeoutPrefs = getSharedPreferences("su_timeout", 0);
+        timeoutPrefs = Utils.getDEContext().getSharedPreferences("su_timeout", 0);
 
         // Get policy
         Intent intent = getIntent();
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 01adc1fa4..7e52d762b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,10 +8,9 @@
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
-        android:installLocation="internalOnly"
         android:allowBackup="true"
-        android:directBootAware="true"
         android:icon="@drawable/ic_launcher"
+        android:installLocation="internalOnly"
         android:label="@string/app_name"
         android:supportsRtl="true"
         tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
@@ -28,4 +27,4 @@
 
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>