diff --git a/Ferrite/Views/ComponentViews/Plugin/Buttons/InstalledPluginButtonView.swift b/Ferrite/Views/ComponentViews/Plugin/Buttons/InstalledPluginButtonView.swift
index 8a8fa00..09d1b97 100644
--- a/Ferrite/Views/ComponentViews/Plugin/Buttons/InstalledPluginButtonView.swift
+++ b/Ferrite/Views/ComponentViews/Plugin/Buttons/InstalledPluginButtonView.swift
@@ -36,7 +36,8 @@ struct InstalledPluginButtonView<P: Plugin>: View {
                         .lineLimit(1)
                 }
 
-                if let tags = installedPlugin.getTags(), !tags.isEmpty {
+                let tags = installedPlugin.getTags()
+                if !tags.isEmpty {
                     PluginTagsView(tags: tags)
                 }
             }
diff --git a/Ferrite/Views/ComponentViews/Plugin/Buttons/PluginCatalogButtonView.swift b/Ferrite/Views/ComponentViews/Plugin/Buttons/PluginCatalogButtonView.swift
index d4fb4c6..46043bc 100644
--- a/Ferrite/Views/ComponentViews/Plugin/Buttons/PluginCatalogButtonView.swift
+++ b/Ferrite/Views/ComponentViews/Plugin/Buttons/PluginCatalogButtonView.swift
@@ -33,7 +33,8 @@ struct PluginCatalogButtonView<PJ: PluginJson>: View {
                     .lineLimit(1)
                 }
 
-                if let tags = availablePlugin.getTags(), !tags.isEmpty {
+                let tags = availablePlugin.getTags()
+                if !tags.isEmpty {
                     PluginTagsView(tags: tags)
                 }
             }
diff --git a/Ferrite/Views/ComponentViews/Plugin/Info/PluginInfoMetaView.swift b/Ferrite/Views/ComponentViews/Plugin/Info/PluginInfoMetaView.swift
index 4d10509..b5a2a68 100644
--- a/Ferrite/Views/ComponentViews/Plugin/Info/PluginInfoMetaView.swift
+++ b/Ferrite/Views/ComponentViews/Plugin/Info/PluginInfoMetaView.swift
@@ -44,7 +44,8 @@ struct PluginInfoMetaView<P: Plugin>: View {
                     .font(.caption)
                 }
 
-                if let tags = selectedPlugin.getTags(), !tags.isEmpty {
+                let tags = selectedPlugin.getTags()
+                if !tags.isEmpty {
                     PluginTagsView(tags: tags)
                 }
             }
diff --git a/Ferrite/Views/ComponentViews/Plugin/PluginAggregateView.swift b/Ferrite/Views/ComponentViews/Plugin/PluginAggregateView.swift
index b32d469..835c0c9 100644
--- a/Ferrite/Views/ComponentViews/Plugin/PluginAggregateView.swift
+++ b/Ferrite/Views/ComponentViews/Plugin/PluginAggregateView.swift
@@ -33,13 +33,12 @@ struct PluginAggregateView<P: Plugin, PJ: PluginJson>: View {
 
     var body: some View {
         List {
-            if
-                let filteredUpdatedPlugins = pluginManager.fetchUpdatedPlugins(
-                    forType: PJ.self,
-                    installedPlugins: installedPlugins,
-                    searchText: searchText
-                ),
-                !filteredUpdatedPlugins.isEmpty
+            let filteredUpdatedPlugins = pluginManager.fetchUpdatedPlugins(
+                forType: PJ.self,
+                installedPlugins: installedPlugins,
+                searchText: searchText
+            )
+            if !filteredUpdatedPlugins.isEmpty
             {
                 Section(header: InlineHeader("Updates")) {
                     ForEach(filteredUpdatedPlugins, id: \.self) { (updatedPlugin: PJ) in
@@ -60,13 +59,13 @@ struct PluginAggregateView<P: Plugin, PJ: PluginJson>: View {
                 }
             }
 
-            if
-                let filteredAvailablePlugins = pluginManager.fetchFilteredPlugins(
-                    forType: PJ.self,
-                    installedPlugins: installedPlugins,
-                    searchText: searchText
-                ),
-                !filteredAvailablePlugins.isEmpty
+            
+            let filteredAvailablePlugins = pluginManager.fetchFilteredPlugins(
+                forType: PJ.self,
+                installedPlugins: installedPlugins,
+                searchText: searchText
+            )
+            if !filteredAvailablePlugins.isEmpty
             {
                 Section(header: InlineHeader("Catalog")) {
                     ForEach(filteredAvailablePlugins, id: \.self) { availablePlugin in
diff --git a/Ferrite/Views/ComponentViews/SearchResult/SearchFilterHeaderView.swift b/Ferrite/Views/ComponentViews/SearchResult/SearchFilterHeaderView.swift
index 7bde5ba..dd75d81 100644
--- a/Ferrite/Views/ComponentViews/SearchResult/SearchFilterHeaderView.swift
+++ b/Ferrite/Views/ComponentViews/SearchResult/SearchFilterHeaderView.swift
@@ -26,8 +26,8 @@ struct SearchFilterHeaderView: View {
                         Text("None").tag(nil as Source?)
 
                         ForEach(sources, id: \.self) { source in
-                            if let name = source.name, source.enabled {
-                                Text(name)
+                            if source.enabled {
+                                Text(source.name)
                                     .tag(Source?.some(source))
                             }
                         }
diff --git a/Ferrite/Views/MainView.swift b/Ferrite/Views/MainView.swift
index 98a2e96..49d35f0 100644
--- a/Ferrite/Views/MainView.swift
+++ b/Ferrite/Views/MainView.swift
@@ -54,8 +54,6 @@ struct MainView: View {
             case .batch:
                 BatchChoiceView()
             case .activity:
-                EmptyView()
-                // TODO: Fix share sheet
                 if #available(iOS 16, *) {
                     ShareSheet(activityItems: navModel.activityItems)
                         .presentationDetents([.medium, .large])
diff --git a/Ferrite/Views/SettingsView.swift b/Ferrite/Views/SettingsView.swift
index eda26ec..f85773c 100644
--- a/Ferrite/Views/SettingsView.swift
+++ b/Ferrite/Views/SettingsView.swift
@@ -80,8 +80,7 @@ struct SettingsView: View {
                 }
 
                 Section(header: InlineHeader("Default actions")) {
-                    // TODO: Uncomment
-                    //if debridManager.enabledDebrids.count > 0 {
+                    if debridManager.enabledDebrids.count > 0 {
                         NavigationLink {
                             DefaultActionPickerView(
                                 actionRequirement: .debrid,
@@ -108,7 +107,7 @@ struct SettingsView: View {
                                 .foregroundColor(.secondary)
                             }
                         }
-                    //}
+                    }
 
                     NavigationLink {
                         DefaultActionPickerView(