diff --git a/java/execution/impl/src/com/intellij/execution/junit/JavaRunConfigurationProducerBase.java b/java/execution/impl/src/com/intellij/execution/junit/JavaRunConfigurationProducerBase.java
index 0c8efd1af65d..1803a99441d0 100644
--- a/java/execution/impl/src/com/intellij/execution/junit/JavaRunConfigurationProducerBase.java
+++ b/java/execution/impl/src/com/intellij/execution/junit/JavaRunConfigurationProducerBase.java
@@ -19,6 +19,10 @@ import org.jetbrains.annotations.Nullable;
  * @author yole
  */
 public abstract class JavaRunConfigurationProducerBase<T extends ModuleBasedConfiguration> extends RunConfigurationProducer<T> {
+  /**
+   * @deprecated Override {@link #getConfigurationFactory()}.
+   */
+  @Deprecated
   protected JavaRunConfigurationProducerBase(ConfigurationFactory configurationFactory) {
     super(configurationFactory);
   }
@@ -28,7 +32,7 @@ public abstract class JavaRunConfigurationProducerBase<T extends ModuleBasedConf
    */
   @Deprecated
   protected JavaRunConfigurationProducerBase(@NotNull ConfigurationType configurationType) {
-    this(configurationType.getConfigurationFactories()[0]);
+    super(configurationType.getConfigurationFactories()[0]);
   }
 
   protected JavaRunConfigurationProducerBase() {
diff --git a/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java b/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java
index 515009373197..b159d871c527 100644
--- a/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java
+++ b/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java
@@ -44,6 +44,10 @@ public abstract class RunConfigurationProducer<T extends RunConfiguration> {
 
   private final ConfigurationFactory myConfigurationFactory;
 
+  /**
+   * @deprecated Use {@link LazyRunConfigurationProducer}.
+   */
+  @Deprecated
   protected RunConfigurationProducer(@NotNull ConfigurationFactory configurationFactory) {
     myConfigurationFactory = configurationFactory;
   }
diff --git a/python/src/com/jetbrains/python/run/AbstractServerPythonRunConfiguration.java b/python/src/com/jetbrains/python/run/AbstractServerPythonRunConfiguration.java
index 4d459946702c..ceb5d27b8936 100644
--- a/python/src/com/jetbrains/python/run/AbstractServerPythonRunConfiguration.java
+++ b/python/src/com/jetbrains/python/run/AbstractServerPythonRunConfiguration.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.jetbrains.python.run;
 
 import com.intellij.execution.configurations.ConfigurationFactory;
@@ -19,7 +17,7 @@ abstract public class AbstractServerPythonRunConfiguration<T extends AbstractSer
   @NonNls private static final String LAUNCH_JAVASCRIPT_DEBUGGER = "launchJavascriptDebuger";
   private boolean myLaunchJavascriptDebugger;
 
-  public AbstractServerPythonRunConfiguration(final Project project, final ConfigurationFactory factory) {
+  public AbstractServerPythonRunConfiguration(@NotNull Project project, @NotNull ConfigurationFactory factory) {
     super(project, factory);
   }