diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java
index 05d56161bade..4d7d65fff3c5 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java
@@ -142,7 +142,7 @@ public abstract class XDebuggerEditorBase {
 
   public abstract JComponent getComponent();
 
-  protected abstract void setEditorText(XExpression text);
+  protected abstract void doSetText(XExpression text);
 
   public void setExpression(@Nullable XExpression text) {
     if (text == null) {
@@ -174,7 +174,7 @@ public abstract class XDebuggerEditorBase {
       myChooseFactory.setDisabledIcon(IconLoader.getDisabledIcon(icon));
     }
 
-    setEditorText(text);
+    doSetText(text);
   }
 
   @Nullable
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerExpressionComboBox.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerExpressionComboBox.java
index eaff436919db..3039d2acda7f 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerExpressionComboBox.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerExpressionComboBox.java
@@ -128,7 +128,7 @@ public class XDebuggerExpressionComboBox extends XDebuggerEditorBase {
   }
 
   @Override
-  protected void setEditorText(XExpression text) {
+  protected void doSetText(XExpression text) {
     if (myComboBox.getItemCount() > 0) {
       myComboBox.setSelectedIndex(0);
     }
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerMultilineEditor.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerMultilineEditor.java
index 386bca17e856..b2222ce556c5 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerMultilineEditor.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerMultilineEditor.java
@@ -69,7 +69,7 @@ public class XDebuggerMultilineEditor extends XDebuggerEditorBase {
   }
 
   @Override
-  protected void setEditorText(XExpression text) {
+  protected void doSetText(XExpression text) {
     myExpression = text;
     Language language = text.getLanguage();
     FileType fileType = language != null ? language.getAssociatedFileType() : getEditorsProvider().getFileType();
diff --git a/python/edu/build/pycharm_edu_build.gant b/python/edu/build/pycharm_edu_build.gant
index 356df8c7d4c7..85889184ab09 100644
--- a/python/edu/build/pycharm_edu_build.gant
+++ b/python/edu/build/pycharm_edu_build.gant
@@ -144,8 +144,11 @@ target('default': "Build artifacts") {
 
   layoutEducational("${paths.sandbox}/classes/production", usedJars)
 
-
   def extraArgs = ["build.code": "pycharm${buildName}", "build.number": "PE-$buildNumber", "artifacts.path": "${paths.artifacts}"]
+  signMacZip("pycharm", extraArgs)
+  notifyArtifactBuilt("${paths.artifacts}/pycharm${buildName}.sit")
+  buildDmg("pycharm", "${pythonEduHome}/build/DMG_background.png", extraArgs)
+
   signMacZip("pycharm", extraArgs + ["sitFileName": "pycharm${buildName}-jdk-bundled", "jdk_archive_name": "jdk_mac_redist_for_${buildNumber}.tar"])
   buildDmg("pycharm", "${pythonEduHome}/build/DMG_background.png", extraArgs + ["sitFileName": "pycharm${buildName}-jdk-bundled", "jdk_archive_name": "jdk_mac_redist_for_${buildNumber}.tar"])
 
@@ -206,7 +209,7 @@ public layoutEducational(String classesPath, Set usedJars) {
   String macAppRoot = isEap() ? "PyCharm Educational ${p("component.version.major")}.${p("component.version.minor")} EAP.app/Contents" : "PyCharm Educational.app/Contents"
   buildMacZip(macAppRoot, "${paths.artifacts}/pycharm${buildName}.sit", [paths.distAll], paths.distMac)
   ant.copy(file: "${paths.artifacts}/pycharm${buildName}.sit", tofile: "${paths.artifacts}/pycharm${buildName}-jdk-bundled.sit")
-  ant.delete(file: "${paths.artifacts}/pycharm${buildName}.sit")
+  //ant.delete(file: "${paths.artifacts}/pycharm${buildName}.sit")
 }
 
 private layoutPlugins(layouts) {
diff --git a/python/src/com/jetbrains/python/debugger/array/ArrayTableCellEditor.java b/python/src/com/jetbrains/python/debugger/array/ArrayTableCellEditor.java
index 6095d1d0047d..05ba00ebd17a 100644
--- a/python/src/com/jetbrains/python/debugger/array/ArrayTableCellEditor.java
+++ b/python/src/com/jetbrains/python/debugger/array/ArrayTableCellEditor.java
@@ -143,7 +143,7 @@ public class ArrayTableCellEditor extends AbstractCellEditor implements TableCel
     }
 
     @Override
-    protected void setEditorText(XExpression text) {
+    protected void doSetText(XExpression text) {
       myEditorTextField.setText(text.getExpression());
     }
 
diff --git a/python/src/com/jetbrains/python/refactoring/rename/RenamePyClassProcessor.java b/python/src/com/jetbrains/python/refactoring/rename/RenamePyClassProcessor.java
index b4917dd0767c..3f11c0505ee5 100644
--- a/python/src/com/jetbrains/python/refactoring/rename/RenamePyClassProcessor.java
+++ b/python/src/com/jetbrains/python/refactoring/rename/RenamePyClassProcessor.java
@@ -17,6 +17,7 @@ package com.jetbrains.python.refactoring.rename;
 
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
+import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.util.Processor;
 import com.jetbrains.python.PyNames;
@@ -67,7 +68,7 @@ public class RenamePyClassProcessor extends RenamePyElementProcessor {
       if (initMethod != null) {
         final List<PsiReference> allRefs = Collections.synchronizedList(new ArrayList<PsiReference>());
         allRefs.addAll(super.findReferences(element));
-        ReferencesSearch.search(initMethod).forEach(new Processor<PsiReference>() {
+        ReferencesSearch.search(initMethod, GlobalSearchScope.projectScope(element.getProject())).forEach(new Processor<PsiReference>() {
           @Override
           public boolean process(PsiReference psiReference) {
             if (psiReference.getCanonicalText().equals(((PyClass)element).getName())) {