diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt
index 936a91146..42704fb32 100644
--- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt
@@ -43,7 +43,6 @@ class CollectionCreationUIView(
     actionEmitter,
     changesObservable
 ) {
-
     override val view = LayoutInflater.from(container.context)
         .inflate(R.layout.component_collection_creation, container, true)
 
diff --git a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt b/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt
index 87f69496e..c3497729c 100644
--- a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt
@@ -14,7 +14,7 @@ import mozilla.components.browser.domains.autocomplete.ShippedDomainsProvider
 import mozilla.components.browser.toolbar.BrowserToolbar
 import mozilla.components.concept.storage.HistoryStorage
 import mozilla.components.feature.toolbar.ToolbarAutocompleteFeature
-import mozilla.components.support.ktx.android.content.res.pxToDp
+import mozilla.components.support.ktx.android.util.dpToPx
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.getColorFromAttr
 import org.mozilla.fenix.search.SearchState
@@ -66,7 +66,7 @@ class ToolbarView(
         view.apply {
             editMode()
 
-            elevation = resources.pxToDp(TOOLBAR_ELEVATION_IN_DP).toFloat()
+            elevation = TOOLBAR_ELEVATION_IN_DP.dpToPx(resources.displayMetrics).toFloat()
 
             setOnUrlCommitListener {
                 interactor.onUrlCommitted(it)
diff --git a/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt
index 553f6c811..2580d8d66 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/TurnOnSyncFragment.kt
@@ -66,7 +66,6 @@ class TurnOnSyncFragment : Fragment(), AccountObserver {
             // We could auto-close this tab once we get to the end of the authentication process?
             // Via an interceptor, perhaps.
             requireComponents.analytics.metrics.track(Event.SyncAuthSignIn)
-            true
         }
     }
 
@@ -75,8 +74,6 @@ class TurnOnSyncFragment : Fragment(), AccountObserver {
             val directions = TurnOnSyncFragmentDirections.actionTurnOnSyncFragmentToPairFragment()
             Navigation.findNavController(view!!).navigate(directions)
             requireComponents.analytics.metrics.track(Event.SyncAuthScanPairing)
-
-            true
         }
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt
index 4f7466d4d..6dff18250 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt
@@ -245,7 +245,7 @@ class QuickSettingsSheetDialogFragment : AppCompatDialogFragment() {
     private val sessionObserver = object : Session.Observer {
         override fun onUrlChanged(session: Session, url: String) {
             lifecycleScope.launch(Dispatchers.IO) {
-                val host = session.url.toUri()?.host
+                val host = session.url.toUri().host
                 val sitePermissions: SitePermissions? = host?.let {
                     val storage = requireContext().components.core.permissionStorage
                     storage.findSitePermissionsBy(it)