diff --git a/Interop/StubGenerator/build.gradle b/Interop/StubGenerator/build.gradle
index 2777a7630a9..83b9967133e 100644
--- a/Interop/StubGenerator/build.gradle
+++ b/Interop/StubGenerator/build.gradle
@@ -27,5 +27,5 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
     compile "org.jetbrains.kotlin:kotlin-compiler:$buildKotlinVersion"
     compile project(':Interop:Indexer')
-    compile 'org.jetbrains.kotlin:kotlin-native-shared'
+    compile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
 }
diff --git a/backend.native/build.gradle b/backend.native/build.gradle
index 58687cac017..d24cdd01f3f 100644
--- a/backend.native/build.gradle
+++ b/backend.native/build.gradle
@@ -147,10 +147,10 @@ dependencies {
     compilerCompile kotlinCompilerModule
     compilerCompile kotlinNativeInterop['llvm'].configuration
     compilerCompile kotlinNativeInterop['hash'].configuration
-    compilerCompile 'org.jetbrains.kotlin:kotlin-native-shared'
+    compilerCompile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
 
     cli_bcCompile "org.jetbrains.kotlin:kotlin-runtime:$buildKotlinVersion"
-    cli_bcCompile 'org.jetbrains.kotlin:kotlin-native-shared'
+    cli_bcCompile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
     cli_bcCompile sourceSets.compiler.output
 
     bc_frontendCompile kotlinCompilerModule
diff --git a/backend.native/debugger-tests/build.gradle b/backend.native/debugger-tests/build.gradle
index 4f6acbccbc3..f40ea9996da 100644
--- a/backend.native/debugger-tests/build.gradle
+++ b/backend.native/debugger-tests/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'kotlin'
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
     compile project(path: ':backend.native', configuration: 'cli_bc')
-    compile 'org.jetbrains.kotlin:kotlin-native-shared'
+    compile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
     compile 'junit:junit:4.12'
 }
 
diff --git a/build.gradle b/build.gradle
index f40a138de13..d23d55fbb1a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -412,3 +412,9 @@ task clean {
         delete bundle.outputs.files
     }
 }
+
+// Don't run with other tasks (e.g. ./gradlew cleanAll bundle)
+task cleanAll {
+    dependsOn gradle.includedBuilds.collect { it.task(":clean") }
+    dependsOn project.getTasksByName("clean", true)
+}
diff --git a/shared/build.gradle b/shared/build.gradle
index 55459ab7891..93831aad4d3 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -33,6 +33,10 @@ repositories {
     }
 }
 
+jar {
+    archiveName = "shared.jar"
+}
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
 }
diff --git a/tools/kotlin-native-gradle-plugin/build.gradle b/tools/kotlin-native-gradle-plugin/build.gradle
index 6487127cc27..4d979c868bd 100644
--- a/tools/kotlin-native-gradle-plugin/build.gradle
+++ b/tools/kotlin-native-gradle-plugin/build.gradle
@@ -74,11 +74,11 @@ configurations {
 }
 
 dependencies {
-    compile 'org.jetbrains.kotlin:kotlin-native-shared'
+    compile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
     compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
     compile gradleApi()
 
-    bundleDependencies 'org.jetbrains.kotlin:kotlin-native-shared'
+    bundleDependencies "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
 
     testCompile gradleTestKit()
     testCompile 'junit:junit:4.12'