diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/PositionHighlighter.java b/java/debugger/impl/src/com/intellij/debugger/ui/PositionHighlighter.java
index 43475505cecb..242e157a705b 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/PositionHighlighter.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/PositionHighlighter.java
@@ -225,10 +225,12 @@ public class PositionHighlighter {
         }
 
         if (breakpoint instanceof BreakpointWithHighlighter) {
-          breakpoint.reload();
-          final SourcePosition sourcePosition = ((BreakpointWithHighlighter)breakpoint).getSourcePosition();
-          if (sourcePosition == null || sourcePosition.getLine() != lineIndex) {
-            eventsOutOfLine.add(eventDescriptor);
+          if (((BreakpointWithHighlighter)breakpoint).isVisible()) {
+            breakpoint.reload();
+            final SourcePosition sourcePosition = ((BreakpointWithHighlighter)breakpoint).getSourcePosition();
+            if (sourcePosition == null || sourcePosition.getLine() != lineIndex) {
+              eventsOutOfLine.add(eventDescriptor);
+            }
           }
         }
         else {
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
index 32494482c0b3..18b7e0d30876 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
@@ -284,13 +284,16 @@ class InplaceIntroduceParameterPopup extends IntroduceParameterSettingsUI {
                                           getReplaceFieldsWithGetters(), myMustBeFinal || myFinal, isGenerateDelegate(),
                                           myParameterTypePointer.getType(),
                                           parametersToRemove);
+        final boolean [] conflictsFound = new boolean[] {true};
         processor.setPrepareSuccessfulSwingThreadCallback(new Runnable() {
           @Override
           public void run() {
+            conflictsFound[0] = false;
           }
         });
         processor.run();
         normalizeParameterIdxAccordingToRemovedParams(parametersToRemove);
+        success = !conflictsFound[0];
       }
       super.moveOffsetAfter(success);
     }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovyBraceMatcher.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovyBraceMatcher.java
index 5f57ad8c961f..4fe4f106afff 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovyBraceMatcher.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovyBraceMatcher.java
@@ -23,6 +23,7 @@ import com.intellij.psi.TokenType;
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.plugins.groovy.GroovyFileType;
 import org.jetbrains.plugins.groovy.lang.groovydoc.lexer.GroovyDocTokenTypes;
 import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
 import org.jetbrains.plugins.groovy.lang.lexer.TokenSets;
@@ -60,7 +61,8 @@ public class GroovyBraceMatcher implements PairedBraceMatcher {
         || tokenType == GroovyTokenTypes.mRPAREN
         || tokenType == GroovyTokenTypes.mRBRACK
         || tokenType == GroovyTokenTypes.mRCURLY
-        || tokenType == GroovyTokenTypes.mGSTRING_BEGIN;
+        || tokenType == GroovyTokenTypes.mGSTRING_BEGIN
+        || tokenType.getLanguage() != GroovyFileType.GROOVY_LANGUAGE;
   }
 
   public int getCodeConstructStart(PsiFile file, int openingBraceOffset) {
diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationProducer.java b/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationProducer.java
index 91ea90de42a9..a78e9ce33e3e 100644
--- a/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationProducer.java
+++ b/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationProducer.java
@@ -16,6 +16,7 @@
 
 package com.intellij.execution.junit;
 
+import com.intellij.execution.JavaExecutionUtil;
 import com.intellij.execution.Location;
 import com.intellij.execution.RunManagerEx;
 import com.intellij.execution.RunnerAndConfigurationSettings;
@@ -55,6 +56,7 @@ public abstract class JUnitConfigurationProducer extends JavaRuntimeConfiguratio
       ((JUnitConfiguration)((RunManagerImpl)RunManagerEx.getInstanceEx(location.getProject()))
         .getConfigurationTemplate(getConfigurationFactory())
         .getConfiguration()).getConfigurationModule().getModule();
+    location = JavaExecutionUtil.stepIntoSingleClass(location);
     final PsiElement element = location.getPsiElement();
     final PsiClass testClass = JUnitUtil.getTestClass(element);
     final PsiMethod testMethod = JUnitUtil.getTestMethod(element);