diff --git a/modules/launcher/AppList.qml b/modules/launcher/AppList.qml
index 6a2901bc..2c9d52fe 100644
--- a/modules/launcher/AppList.qml
+++ b/modules/launcher/AppList.qml
@@ -1,7 +1,7 @@
 pragma ComponentBehavior: Bound
 
-import "items"
-import "services"
+import qs.modules.launcher.items
+import qs.modules.launcher.services
 import qs.components
 import qs.components.controls
 import qs.components.containers
diff --git a/modules/launcher/Content.qml b/modules/launcher/Content.qml
index 885b979e..40be1227 100644
--- a/modules/launcher/Content.qml
+++ b/modules/launcher/Content.qml
@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import "services"
+import qs.modules.launcher.services
 import qs.components
 import qs.components.controls
 import qs.services
diff --git a/modules/launcher/ContentList.qml b/modules/launcher/ContentList.qml
index b5294047..204f183b 100644
--- a/modules/launcher/ContentList.qml
+++ b/modules/launcher/ContentList.qml
@@ -19,7 +19,7 @@ Item {
     required property int rounding
 
     readonly property bool showWallpapers: search.text.startsWith(`${Config.launcher.actionPrefix}wallpaper `)
-    readonly property Item currentList: showWallpapers ? wallpaperList.item : appList.item
+    readonly property var currentList: showWallpapers ? wallpaperList.item : appList.item // Can be either ListView or PathView, so can't type properly
 
     anchors.horizontalCenter: parent.horizontalCenter
     anchors.bottom: parent.bottom
diff --git a/modules/launcher/WallpaperList.qml b/modules/launcher/WallpaperList.qml
index 4aba4365..542a64e8 100644
--- a/modules/launcher/WallpaperList.qml
+++ b/modules/launcher/WallpaperList.qml
@@ -18,7 +18,7 @@ PathView {
     readonly property int itemWidth: Config.launcher.sizes.wallpaperWidth * 0.8 + Appearance.padding.larger * 2
 
     readonly property int numItems: {
-        const screen = QsWindow.window?.screen;
+        const screen = (QsWindow.window as QsWindow)?.screen;
         if (!screen)
             return 0;
 
@@ -58,7 +58,7 @@ PathView {
 
     onCurrentItemChanged: {
         if (currentItem)
-            Wallpapers.preview(currentItem.modelData.path);
+            Wallpapers.preview((currentItem as WallpaperItem).modelData.path);
     }
 
     implicitWidth: Math.min(numItems, count) * itemWidth
diff --git a/modules/launcher/items/AppItem.qml b/modules/launcher/items/AppItem.qml
index eb738a84..812172b5 100644
--- a/modules/launcher/items/AppItem.qml
+++ b/modules/launcher/items/AppItem.qml
@@ -1,4 +1,4 @@
-import "../services"
+import qs.modules.launcher.services
 import qs.components
 import qs.services
 import qs.config
diff --git a/modules/launcher/items/SchemeItem.qml b/modules/launcher/items/SchemeItem.qml
index 65bd6526..c041b325 100644
--- a/modules/launcher/items/SchemeItem.qml
+++ b/modules/launcher/items/SchemeItem.qml
@@ -1,4 +1,4 @@
-import "../services"
+import qs.modules.launcher.services
 import qs.components
 import qs.services
 import qs.config
diff --git a/modules/launcher/items/VariantItem.qml b/modules/launcher/items/VariantItem.qml
index 53bffe15..9554f509 100644
--- a/modules/launcher/items/VariantItem.qml
+++ b/modules/launcher/items/VariantItem.qml
@@ -1,4 +1,4 @@
-import "../services"
+import qs.modules.launcher.services
 import qs.components
 import qs.services
 import qs.config
diff --git a/modules/launcher/items/WallpaperItem.qml b/modules/launcher/items/WallpaperItem.qml
index 476efc45..22e2bff2 100644
--- a/modules/launcher/items/WallpaperItem.qml
+++ b/modules/launcher/items/WallpaperItem.qml
@@ -14,7 +14,7 @@ Item {
 
     scale: 0.5
     opacity: 0
-    z: PathView.z ?? 0
+    z: PathView.z ?? 0 // qmllint disable missing-property
 
     Component.onCompleted: {
         scale = Qt.binding(() => PathView.isCurrentItem ? 1 : PathView.onPath ? 0.8 : 0);
diff --git a/modules/launcher/services/Schemes.qml b/modules/launcher/services/Schemes.qml
index dbb2dac0..646dd10a 100644
--- a/modules/launcher/services/Schemes.qml
+++ b/modules/launcher/services/Schemes.qml
@@ -55,7 +55,7 @@ Searcher {
                     for (const f of s)
                         flat.push(f);
 
-                schemes.model = flat.sort((a, b) => (a.name + a.flavour).localeCompare((b.name + b.flavour)));
+                schemes.model = flat.sort((a, b) => String(a.name + a.flavour).localeCompare((b.name + b.flavour)));
             }
         }
     }