diff --git a/app/src/main/java/com/aurora/extensions/PackageInfo.kt b/app/src/main/java/com/aurora/extensions/PackageInfo.kt
index 41b83296d..7e5d60e68 100644
--- a/app/src/main/java/com/aurora/extensions/PackageInfo.kt
+++ b/app/src/main/java/com/aurora/extensions/PackageInfo.kt
@@ -8,10 +8,10 @@ fun PackageInfo.isApp(): Boolean {
 
     return when {
         isQAndAbove() -> {
-            Process.isApplicationUid(this.applicationInfo.uid) &&
-                    !this.applicationInfo.isResourceOverlay && !this.isApex
+            Process.isApplicationUid(this.applicationInfo!!.uid) &&
+                    !this.applicationInfo!!.isResourceOverlay && !this.isApex
         }
-        isNAndAbove() -> Process.isApplicationUid(this.applicationInfo.uid)
-        else -> this.packageName != null && this.versionName != null
+        isNAndAbove() -> Process.isApplicationUid(this.applicationInfo!!.uid)
+        else -> this.versionName != null
     }
 }
diff --git a/app/src/main/java/com/aurora/store/data/installer/AppInstaller.kt b/app/src/main/java/com/aurora/store/data/installer/AppInstaller.kt
index 37075cf11..bddf51a62 100644
--- a/app/src/main/java/com/aurora/store/data/installer/AppInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/AppInstaller.kt
@@ -131,7 +131,7 @@ class AppInstaller @Inject constructor(
                 )
                 val version = PackageInfoCompat.getLongVersionCode(packageInfo)
 
-                packageInfo.applicationInfo.enabled && version >= 9
+                packageInfo.applicationInfo!!.enabled && version >= 9
             } catch (exception: Exception) {
                 false
             }
diff --git a/app/src/main/java/com/aurora/store/data/providers/NativeGsfVersionProvider.kt b/app/src/main/java/com/aurora/store/data/providers/NativeGsfVersionProvider.kt
index bd660472b..763291eb9 100644
--- a/app/src/main/java/com/aurora/store/data/providers/NativeGsfVersionProvider.kt
+++ b/app/src/main/java/com/aurora/store/data/providers/NativeGsfVersionProvider.kt
@@ -39,7 +39,7 @@ class NativeGsfVersionProvider(context: Context) {
         try {
             val packageInfo = getPackageInfo(context, GOOGLE_VENDING_PACKAGE_ID)
             vendingVersionCode = PackageInfoCompat.getLongVersionCode(packageInfo)
-            vendingVersionString = packageInfo.versionName
+            vendingVersionString = packageInfo.versionName!!
         } catch (e: PackageManager.NameNotFoundException) {
             // com.android.vending not found
         }
diff --git a/app/src/main/java/com/aurora/store/data/work/ExportWorker.kt b/app/src/main/java/com/aurora/store/data/work/ExportWorker.kt
index 3daf0067d..43ce4be46 100644
--- a/app/src/main/java/com/aurora/store/data/work/ExportWorker.kt
+++ b/app/src/main/java/com/aurora/store/data/work/ExportWorker.kt
@@ -140,8 +140,8 @@ class ExportWorker @AssistedInject constructor(
         val packageInfo = getPackageInfo(appContext, packageName, PackageManager.GET_META_DATA)
         val fileList: MutableList<File?> = mutableListOf()
 
-        fileList.add(File(packageInfo.applicationInfo.sourceDir))
-        packageInfo.applicationInfo.splitSourceDirs?.let { splits ->
+        fileList.add(File(packageInfo.applicationInfo!!.sourceDir))
+        packageInfo.applicationInfo!!.splitSourceDirs?.let { splits ->
             fileList.addAll(splits.map { File(it) })
         }
 
diff --git a/app/src/main/java/com/aurora/store/util/CertUtil.kt b/app/src/main/java/com/aurora/store/util/CertUtil.kt
index ec74f0c5f..b88fe37d4 100644
--- a/app/src/main/java/com/aurora/store/util/CertUtil.kt
+++ b/app/src/main/java/com/aurora/store/util/CertUtil.kt
@@ -92,14 +92,14 @@ object CertUtil {
         return try {
             val packageInfo = getPackageInfoWithSignature(context, packageName)
             if (isPAndAbove()) {
-                if (packageInfo.signingInfo.hasMultipleSigners()) {
-                    packageInfo.signingInfo.apkContentsSigners.map { it.generateX509Certificate() }
+                if (packageInfo.signingInfo!!.hasMultipleSigners()) {
+                    packageInfo.signingInfo!!.apkContentsSigners.map { it.generateX509Certificate() }
                 } else {
-                    packageInfo.signingInfo.signingCertificateHistory.map { it.generateX509Certificate() }
+                    packageInfo.signingInfo!!.signingCertificateHistory.map { it.generateX509Certificate() }
                 }
             } else {
                 @Suppress("DEPRECATION")
-                packageInfo.signatures.map { it.generateX509Certificate() }
+                packageInfo.signatures!!.map { it.generateX509Certificate() }
             }
         } catch (exception: Exception) {
             Log.e(TAG, "Failed to get X509 certificates", exception)
diff --git a/app/src/main/java/com/aurora/store/util/PackageUtil.kt b/app/src/main/java/com/aurora/store/util/PackageUtil.kt
index 8949f44ee..bd2766f7c 100644
--- a/app/src/main/java/com/aurora/store/util/PackageUtil.kt
+++ b/app/src/main/java/com/aurora/store/util/PackageUtil.kt
@@ -150,7 +150,7 @@ object PackageUtil {
     fun getIconForPackage(context: Context, packageName: String): Bitmap? {
         return try {
             val packageInfo = context.packageManager.getPackageInfo(packageName, 0)
-            val icon = packageInfo.applicationInfo.loadIcon(context.packageManager)
+            val icon = packageInfo.applicationInfo!!.loadIcon(context.packageManager)
             if (icon.intrinsicWidth > 0 && icon.intrinsicHeight > 0) {
                 icon.toBitmap(96, 96)
             } else {
@@ -214,7 +214,7 @@ object PackageUtil {
                         "com.google.toontastic",
                     ).contains(it.packageName)
                 }.filter {
-                    it.packageName?.contains("com.google") == false
+                    !it.packageName.contains("com.google")
                 }
         }
 
@@ -233,7 +233,7 @@ object PackageUtil {
         }
 
         if (!isExtendedUpdateEnabled) {
-            packageInfoList = packageInfoList.filter { it.applicationInfo.enabled }
+            packageInfoList = packageInfoList.filter { it.applicationInfo!!.enabled }
         }
 
         /*Filter F-Droid apps*/
diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/PermissionBottomSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/PermissionBottomSheet.kt
index 75b447800..c64af57f0 100644
--- a/app/src/main/java/com/aurora/store/view/ui/sheets/PermissionBottomSheet.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/sheets/PermissionBottomSheet.kt
@@ -47,7 +47,7 @@ class PermissionBottomSheet : BaseDialogSheet<SheetPermissionsBinding>() {
         currentPerms = try {
             packageManager.getPackageInfo(
                 args.app.packageName, PackageManager.GET_PERMISSIONS
-            ).requestedPermissions.toList()
+            ).requestedPermissions!!.toList()
         } catch (_: Exception) {
             emptyList()
         }