diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt
index 7d80ef440c8..284e3856613 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt
@@ -54,6 +54,10 @@ abstract class KtCodeFragment(
         }
     }
 
+    override final fun init(elementType: IElementType, contentElementType: IElementType?) {
+        super.init(elementType, contentElementType)
+    }
+
     private var resolveScope: GlobalSearchScope? = null
     private var thisType: PsiType? = null
     private var superType: PsiType? = null
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/importedFromObject.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/importedFromObject.kt
index 4619c4da4e7..4fb6b2c9756 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/importedFromObject.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/importedFromObject.kt
@@ -27,12 +27,13 @@ fun PropertyDescriptor.asImportedFromObject(original: PropertyImportedFromObject
 
 abstract class ImportedFromObjectCallableDescriptor<out TCallable : CallableMemberDescriptor>(
         val callableFromObject: TCallable,
-        originalOrNull: TCallable?
+        private val originalOrNull: TCallable?
 ) : CallableDescriptor {
 
     val containingObject = callableFromObject.containingDeclaration as ClassDescriptor
 
-    protected val _original = originalOrNull ?: this
+    protected val _original
+        get() = originalOrNull ?: this
 }
 
 // members imported from object should be wrapped to not require dispatch receiver
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt
index 4d8f582cac7..c04a9e4bf1a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt
@@ -17,16 +17,13 @@
 package org.jetbrains.kotlin.idea.search.declarationsSearch
 
 import com.intellij.psi.search.SearchScope
-import com.intellij.util.Query
-import com.intellij.util.QueryFactory
-import com.intellij.util.Processor
 import com.intellij.openapi.application.QueryExecutorBase
 import com.intellij.psi.PsiElement
 import com.intellij.openapi.project.Project
-import com.intellij.util.EmptyQuery
 import java.util.Stack
 import java.util.HashSet
 import com.intellij.openapi.progress.ProgressIndicatorProvider
+import com.intellij.util.*
 import org.jetbrains.kotlin.psi.psiUtil.contains
 
 interface DeclarationSearchRequest<in T> {
@@ -50,6 +47,10 @@ abstract class DeclarationsSearch<T: PsiElement, R: DeclarationSearchRequest<T>>
         )
     }
 
+    override final fun registerExecutor(executor: QueryExecutor<T, R>) {
+        super.registerExecutor(executor)
+    }
+
     protected abstract fun doSearch(request: R, consumer: Processor<T>)
     protected open fun isApplicable(request: R): Boolean = true
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractIntroduceAction.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractIntroduceAction.kt
index 472045ae2c6..b79683adc60 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractIntroduceAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractIntroduceAction.kt
@@ -25,6 +25,10 @@ abstract class AbstractIntroduceAction : BasePlatformRefactoringAction() {
         setInjectedContext(true)
     }
 
+    override final fun setInjectedContext(worksInInjected: Boolean) {
+        super.setInjectedContext(worksInInjected)
+    }
+
     override fun isAvailableInEditorOnly(): Boolean = true
 
     override fun isEnabledOnElements(elements: Array<out PsiElement>): Boolean =
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/DialogWithEditor.kt b/idea/src/org/jetbrains/kotlin/idea/util/DialogWithEditor.kt
index 3a09fc9205c..1ae1ba67c84 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/DialogWithEditor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/util/DialogWithEditor.kt
@@ -42,6 +42,10 @@ open class DialogWithEditor(
         setTitle(title)
     }
 
+    override final fun init() {
+        super.init()
+    }
+
     private fun createEditor(): Editor {
         val editorFactory = EditorFactory.getInstance()!!
         val virtualFile = LightVirtualFile("dummy.kt", KotlinFileType.INSTANCE, initialText)