diff --git a/build.gradle.kts b/build.gradle.kts
index df498520..173da244 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,7 +14,8 @@ plugins {
     id("org.jetbrains.grammarkit") version "2022.3.2.2" apply false
     idea
 }
-
+val pluginSinceBuild: String by project
+val pluginUntilBuild: String by project
 val javaVersion = property("javaVersion").toString().toInt()
 val lsp4ijVersion: String by project
 val runIdeTarget: String by project
@@ -122,8 +123,10 @@ intellijPlatform {
         }
 
         ideaVersion {
-            sinceBuild = providers.gradleProperty("pluginSinceBuild")
-            untilBuild = providers.gradleProperty("pluginUntilBuild")
+            sinceBuild = pluginSinceBuild
+            if (pluginUntilBuild.isNotBlank()) {
+                untilBuild = pluginUntilBuild
+            }
         }
     }
 
@@ -140,7 +143,13 @@ intellijPlatform {
 
     pluginVerification {
         ides {
-            recommended()
+            select {
+                types = listOf(
+                    IntelliJPlatformType.IntellijIdeaCommunity,
+                    IntelliJPlatformType.IntellijIdeaUltimate,
+                    IntelliJPlatformType.CLion
+                )
+            }
         }
     }
     buildSearchableOptions = false
diff --git a/modules/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/toolchain/ZigDebuggerToolchainService.kt b/modules/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/toolchain/ZigDebuggerToolchainService.kt
index 55fc883b..61ce0876 100644
--- a/modules/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/toolchain/ZigDebuggerToolchainService.kt
+++ b/modules/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/toolchain/ZigDebuggerToolchainService.kt
@@ -327,7 +327,7 @@ class ZigDebuggerToolchainService {
 
         private val pluginDir get() = PathManager.getSystemDir().resolve("zigbrains")
 
-        private val tempPluginDir get() = PathManager.getTempPath().toNioPathOrNull()!!.resolve("zigbrains")
+        private val tempPluginDir get(): Path = PathManager.getTempPath().toNioPathOrNull()!!.resolve("zigbrains")
 
         private fun fileNameWithoutExtension(url: String): String {
             return url.substringAfterLast("/").removeSuffix(".zip").removeSuffix(".tar.gz")
diff --git a/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigTopLevelLineMarker.kt b/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigTopLevelLineMarker.kt
index e3360e30..0df4cf55 100644
--- a/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigTopLevelLineMarker.kt
+++ b/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigTopLevelLineMarker.kt
@@ -20,7 +20,7 @@
  * along with ZigBrains. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.falsepattern.zigbrains.execution.base
+package com.falsepattern.zigbrains.project.execution.base
 
 import com.falsepattern.zigbrains.zig.psi.ZigTypes
 import com.intellij.execution.lineMarker.ExecutorAction
diff --git a/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/build/ZigLineMarkerBuild.kt b/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/build/ZigLineMarkerBuild.kt
index 2035b86a..f686ed3d 100644
--- a/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/build/ZigLineMarkerBuild.kt
+++ b/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/build/ZigLineMarkerBuild.kt
@@ -22,7 +22,7 @@
 
 package com.falsepattern.zigbrains.project.execution.build
 
-import com.falsepattern.zigbrains.execution.base.ZigTopLevelLineMarker
+import com.falsepattern.zigbrains.project.execution.base.ZigTopLevelLineMarker
 import com.falsepattern.zigbrains.zig.psi.ZigTypes
 import com.intellij.icons.AllIcons.RunConfigurations.TestState
 import com.intellij.psi.PsiElement
diff --git a/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/run/ZigLineMarkerRun.kt b/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/run/ZigLineMarkerRun.kt
index 6cbffa1f..ce7ca680 100644
--- a/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/run/ZigLineMarkerRun.kt
+++ b/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/run/ZigLineMarkerRun.kt
@@ -22,7 +22,7 @@
 
 package com.falsepattern.zigbrains.project.execution.run
 
-import com.falsepattern.zigbrains.execution.base.ZigTopLevelLineMarker
+import com.falsepattern.zigbrains.project.execution.base.ZigTopLevelLineMarker
 import com.falsepattern.zigbrains.zig.psi.ZigTypes
 import com.intellij.icons.AllIcons.RunConfigurations.TestState
 import com.intellij.psi.PsiElement
diff --git a/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/test/ZigLineMarkerTest.kt b/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/test/ZigLineMarkerTest.kt
index 2118b5a8..9ad43054 100644
--- a/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/test/ZigLineMarkerTest.kt
+++ b/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/test/ZigLineMarkerTest.kt
@@ -22,7 +22,7 @@
 
 package com.falsepattern.zigbrains.project.execution.test
 
-import com.falsepattern.zigbrains.execution.base.ZigTopLevelLineMarker
+import com.falsepattern.zigbrains.project.execution.base.ZigTopLevelLineMarker
 import com.falsepattern.zigbrains.zig.psi.ZigTypes
 import com.intellij.icons.AllIcons.RunConfigurations.TestState
 import com.intellij.psi.PsiElement
diff --git a/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowContext.kt b/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowContext.kt
index 8f313c68..9d40c598 100644
--- a/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowContext.kt
+++ b/modules/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowContext.kt
@@ -52,10 +52,6 @@ import com.intellij.ui.components.JBTextArea
 import com.intellij.ui.content.Content
 import com.intellij.ui.content.ContentFactory
 import com.intellij.ui.treeStructure.Tree
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withContext
-import org.intellij.lang.annotations.JdkConstants.BoxLayoutAxis
 import java.awt.GridBagConstraints
 import java.awt.GridBagLayout
 import java.awt.event.MouseAdapter
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index f011c137..4ecdebe9 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -5,7 +5,7 @@
 
     <depends config-file="zigbrains-core.xml">com.intellij.modules.platform</depends>
     <depends config-file="zigbrains-lsp.xml">com.redhat.devtools.lsp4ij</depends>
-    <depends config-file="zigbrains-debugger.xml">com.intellij.modules.cidr.debugger</depends>
+    <depends config-file="zigbrains-debugger.xml" optional="true">com.intellij.modules.cidr.debugger</depends>
 
     <resource-bundle>zigbrains.Bundle</resource-bundle>