diff --git a/python/build/python-plugin-dependencies.xml b/python/build/python-plugin-dependencies.xml
index dc16aedd5e50..b0aa43dad084 100644
--- a/python/build/python-plugin-dependencies.xml
+++ b/python/build/python-plugin-dependencies.xml
@@ -10,6 +10,5 @@
   <depends optional="true" config-file="python-remote-interpreter-plugin.xml">com.jetbrains.plugins.webDeployment</depends>
   <depends>org.jetbrains.plugins.remote-run</depends>
 
-  <xi:include href="/META-INF/pycharm-numpy-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/pycharm-flask-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
 </idea-plugin>
diff --git a/python/helpers/pydev/pydev_monkey.py b/python/helpers/pydev/pydev_monkey.py
index 4770f10939eb..07c7e2b93929 100644
--- a/python/helpers/pydev/pydev_monkey.py
+++ b/python/helpers/pydev/pydev_monkey.py
@@ -29,7 +29,7 @@ def patch_args(args):
         if is_python(args[0]):
             try:
                 indC = args.index('-c')
-            except KeyError:
+            except ValueError:
                 indC = -1
 
             if indC != -1:
diff --git a/python/src/com/jetbrains/python/codeInsight/completion/PythonCompletionWeigher.java b/python/src/com/jetbrains/python/codeInsight/completion/PythonCompletionWeigher.java
index cb6f6404c4e3..f2ada070279a 100644
--- a/python/src/com/jetbrains/python/codeInsight/completion/PythonCompletionWeigher.java
+++ b/python/src/com/jetbrains/python/codeInsight/completion/PythonCompletionWeigher.java
@@ -4,7 +4,7 @@ import com.intellij.codeInsight.completion.CompletionLocation;
 import com.intellij.codeInsight.completion.CompletionWeigher;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementPresentation;
-import com.intellij.psi.util.PsiUtilBase;
+import com.intellij.psi.util.PsiUtilCore;
 import com.jetbrains.python.PythonLanguage;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -20,7 +20,7 @@ public class PythonCompletionWeigher extends CompletionWeigher {
 
   @Override
   public Comparable weigh(@NotNull final LookupElement element, @NotNull final CompletionLocation location) {
-    if (!PsiUtilBase.findLanguageFromElement(location.getCompletionParameters().getPosition()).isKindOf(PythonLanguage.getInstance())) {
+    if (!PsiUtilCore.findLanguageFromElement(location.getCompletionParameters().getPosition()).isKindOf(PythonLanguage.getInstance())) {
       return 0;
     }
 
diff --git a/python/src/com/jetbrains/python/console/PydevConsoleRunner.java b/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
index 1c50c67b4768..b716ba8a958b 100644
--- a/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
+++ b/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
@@ -94,6 +94,7 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
   private Map<String, String> myEnvironmentVariables;
   private String myCommandLine;
   private String[] myStatementsToExecute = ArrayUtil.EMPTY_STRING_ARRAY;
+  private ConsoleHistoryController myHistoryController;
 
   public static Key<ConsoleCommunication> CONSOLE_KEY = new Key<ConsoleCommunication>("PYDEV_CONSOLE_KEY");
 
@@ -144,6 +145,7 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
 
     AnAction showVarsAction = new ShowVarsAction();
     toolbarActions.add(showVarsAction);
+    toolbarActions.add(myHistoryController.getBrowseHistory());
     return actions;
   }
 
@@ -552,8 +554,9 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
     myConsoleExecuteActionHandler =
       new PydevConsoleExecuteActionHandler(getConsoleView(), getProcessHandler(), myPydevConsoleCommunication);
     myConsoleExecuteActionHandler.setEnabled(false);
-    new ConsoleHistoryController(myConsoleType.getTypeId(), "", getLanguageConsole(),
-                                 myConsoleExecuteActionHandler.getConsoleHistoryModel()).install();
+    myHistoryController = new ConsoleHistoryController(myConsoleType.getTypeId(), "", getLanguageConsole(),
+                                 myConsoleExecuteActionHandler.getConsoleHistoryModel());
+    myHistoryController.install();
     return myConsoleExecuteActionHandler;
   }