diff --git a/idea/idea-android/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java b/idea/idea-android/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
index 1a65771269b..24051e2f5b4 100644
--- a/idea/idea-android/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
+++ b/idea/idea-android/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
@@ -17,8 +17,8 @@
 package org.jetbrains.kotlin.android;
 
 import com.android.SdkConstants;
-import com.android.ide.common.rendering.RenderSecurityManager;
-import com.android.tools.idea.rendering.PsiProjectListener;
+import com.android.tools.idea.rendering.RenderSecurityManager;
+import com.android.tools.idea.res.PsiProjectListener;
 import com.intellij.facet.FacetManager;
 import com.intellij.facet.ModifiableFacetModel;
 import com.intellij.ide.startup.impl.StartupManagerImpl;
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt
index 4ac002cbb70..33628d2af7f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt
@@ -122,7 +122,7 @@ object SuperClassNotInitialized : KotlinIntentionActionsFactory() {
                     val offset = newSpecifier.valueArgumentList!!.leftParenthesis!!.endOffset
                     editor.moveCaret(offset)
                     if (!ApplicationManager.getApplication().isUnitTestMode) {
-                        ShowParameterInfoHandler.invoke(project, editor, file, offset - 1, null)
+                        ShowParameterInfoHandler.invoke(project, editor, file, offset - 1, null, true)
                     }
                 }
             }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractParameterInfoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractParameterInfoTest.kt
index 6479cf500d5..fbd7db32cdd 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractParameterInfoTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractParameterInfoTest.kt
@@ -63,7 +63,7 @@ abstract class AbstractParameterInfoTest : LightCodeInsightFixtureTestCase() {
             else -> error("Unexpected last file child")
         }
 
-        val context = ShowParameterInfoContext(editor, project, file, editor.caretModel.offset, -1)
+        val context = ShowParameterInfoContext(editor, project, file, editor.caretModel.offset, -1, true)
 
         val handlers = ShowParameterInfoHandler.getHandlers(project, KotlinLanguage.INSTANCE)!!
         val handler = handlers.firstOrNull { it.findElementForParameterInfo(context) != null }
diff --git a/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/IntellijViewTypeDetector.java b/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/IntellijViewTypeDetector.java
index fdd8f32f31e..287fe0ef081 100644
--- a/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/IntellijViewTypeDetector.java
+++ b/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/IntellijViewTypeDetector.java
@@ -19,7 +19,7 @@ import com.android.annotations.NonNull;
 import com.android.annotations.Nullable;
 import com.android.ide.common.res2.AbstractResourceRepository;
 import com.android.ide.common.res2.ResourceItem;
-import com.android.tools.idea.rendering.LocalResourceRepository;
+import com.android.tools.idea.res.LocalResourceRepository;
 import com.android.tools.klint.checks.ViewTypeDetector;
 import com.android.tools.klint.detector.api.Context;
 import com.android.tools.klint.detector.api.Implementation;