diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt
index d2b58e904..3d28df345 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt
@@ -65,7 +65,7 @@ class ZimFileSelectFragment : BaseFragment() {
   private val disposable = CompositeDisposable()
 
   private val zimManageViewModel by lazy {
-    activity!!.viewModel<ZimManageViewModel>(viewModelFactory)
+    requireActivity().viewModel<ZimManageViewModel>(viewModelFactory)
   }
   private val bookDelegate: BookDelegate by lazy {
     BookDelegate(sharedPreferenceUtil,
@@ -87,8 +87,8 @@ class ZimFileSelectFragment : BaseFragment() {
     container: ViewGroup?,
     savedInstanceState: Bundle?
   ): View? {
-    LanguageUtils(activity!!)
-      .changeFont(activity!!.layoutInflater, sharedPreferenceUtil)
+    LanguageUtils(requireActivity())
+      .changeFont(requireActivity().layoutInflater, sharedPreferenceUtil)
     return inflater.inflate(R.layout.zim_list, container, false)
   }
 
@@ -121,7 +121,7 @@ class ZimFileSelectFragment : BaseFragment() {
 
   private fun sideEffects() = zimManageViewModel.sideEffects.subscribe(
     {
-      val effectResult = it.invokeWith(activity!! as AppCompatActivity)
+      val effectResult = it.invokeWith(requireActivity() as AppCompatActivity)
       if (effectResult is ActionMode) {
         actionMode = effectResult
       }
@@ -159,7 +159,7 @@ class ZimFileSelectFragment : BaseFragment() {
 
   private fun checkPermissions() {
     if (ContextCompat.checkSelfPermission(
-        activity!!,
+        requireActivity(),
         Manifest.permission.READ_EXTERNAL_STORAGE
       ) != PackageManager.PERMISSION_GRANTED
     ) {
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryFragment.kt
index 6707954ef..f08e53015 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryFragment.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/LibraryFragment.kt
@@ -72,7 +72,7 @@ class LibraryFragment : BaseFragment() {
   @Inject lateinit var availableSpaceCalculator: AvailableSpaceCalculator
 
   private val zimManageViewModel by lazy {
-    activity!!.viewModel<ZimManageViewModel>(viewModelFactory)
+    requireActivity().viewModel<ZimManageViewModel>(viewModelFactory)
   }
 
   private val libraryAdapter: LibraryAdapter by lazy {
@@ -86,7 +86,7 @@ class LibraryFragment : BaseFragment() {
   }
 
   private val noWifiWithWifiOnlyPreferenceSet
-    get() = sharedPreferenceUtil.prefWifiOnly && !NetworkUtils.isWiFi(context!!)
+    get() = sharedPreferenceUtil.prefWifiOnly && !NetworkUtils.isWiFi(requireContext())
 
   private val isNotConnected get() = conMan.activeNetworkInfo?.isConnected == false
 
@@ -216,5 +216,5 @@ class LibraryFragment : BaseFragment() {
     .apply {
       onSelectAction = ::storeDeviceInPreferences
     }
-    .show(fragmentManager!!, getString(R.string.pref_storage))
+    .show(requireFragmentManager(), getString(R.string.pref_storage))
 }
diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
index 58c822f62..7d208c6e2 100644
--- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
+++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
@@ -98,6 +98,7 @@ class AllProjectConfigurer {
         ignore(
           "SyntheticAccessor",
           "GoogleAppIndexingApiWarning",
+          "LockedOrientationActivity",
           //TODO stop ignoring below this
           "CheckResult",
           "LabelFor",
diff --git a/core/src/main/java/eu/mhutti1/utils/storage/StorageSelectDialog.kt b/core/src/main/java/eu/mhutti1/utils/storage/StorageSelectDialog.kt
index 1884c3d57..3bef9daf8 100644
--- a/core/src/main/java/eu/mhutti1/utils/storage/StorageSelectDialog.kt
+++ b/core/src/main/java/eu/mhutti1/utils/storage/StorageSelectDialog.kt
@@ -70,7 +70,7 @@ class StorageSelectDialog : DialogFragment() {
       layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
       setHasFixedSize(true)
     }
-    Flowable.fromCallable { StorageDeviceUtils.getWritableStorage(activity!!) }
+    Flowable.fromCallable { StorageDeviceUtils.getWritableStorage(requireActivity()) }
       .subscribeOn(Schedulers.io())
       .observeOn(AndroidSchedulers.mainThread())
       .subscribe(