diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts
index 7808afe84f2..7e105f376b1 100644
--- a/idea/idea-core/build.gradle.kts
+++ b/idea/idea-core/build.gradle.kts
@@ -17,6 +17,7 @@ dependencies {
     compile(project(":j2k"))
     compile(project(":idea:ide-common"))
     compile(project(":idea:idea-jps-common"))
+    compile(project(":usage-statistics"))
     compile(project(":plugins:android-extensions-compiler"))
     compile(project(":kotlin-scripting-compiler"))
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
diff --git a/usage-statistics/build.gradle.kts b/usage-statistics/build.gradle.kts
index 9e1ef745ac6..9756628cd58 100644
--- a/usage-statistics/build.gradle.kts
+++ b/usage-statistics/build.gradle.kts
@@ -7,8 +7,8 @@ plugins {
 jvmTarget = "1.6"
 
 dependencies {
-    testCompile(intellijDep()) {
-        includeJars("platform-api", rootProject = rootProject)
+    compile(intellijDep()) {
+        includeJars("platform-api", "platform-impl", rootProject = rootProject)
         isTransitive = false
     }
 }
@@ -17,3 +17,5 @@ sourceSets {
     "main" { projectDefault() }
     "test" {}
 }
+
+ideaPlugin()
\ No newline at end of file
diff --git a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt b/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt
index 28b6af91894..0ce5533db92 100644
--- a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt
+++ b/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt
@@ -6,10 +6,6 @@
 package org.jetbrains.kotlin.statistics
 
 import com.intellij.internal.statistic.service.fus.collectors.ApplicationUsageTriggerCollector
-import javax.annotation.processing.AbstractProcessor
-import javax.annotation.processing.Processor
-import javax.annotation.processing.RoundEnvironment
-import javax.lang.model.element.TypeElement
 
 open class KotlinStatisticsTrigger(private val groupIdSufix: String) : ApplicationUsageTriggerCollector() {
     override fun getGroupId() = "statistics.kotlin.$groupIdSufix"
@@ -23,7 +19,7 @@ class KotlinVersionTrigger : KotlinGradlePluginStatisticsTrigger("kotlin_version
 
 class KotlinProjectLibraryUsageTrigger : KotlinGradlePluginStatisticsTrigger("library")
 
-open class KotlinIdeActionTrigger(groupIdSufix: String? = null) : KotlinIdeStatisticsTrigger("action" + (groupIdSufix?.let { ".$it" } ?: ""))
+open class KotlinIdeActionTrigger(groupIdSufix: String? = null) : KotlinIdeStatisticsTrigger("action" + (if (groupIdSufix != null) ".$groupIdSufix" else ""))
 
 class KotlinIdeUndoTrigger : KotlinIdeActionTrigger("undo")