diff --git a/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java
index c7ea21b4323..e791319f699 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java
@@ -165,14 +165,10 @@ public class KotlinCompiler {
 
         environment.setStubs(arguments.stubs);
 
-        if (arguments.docOutputDir != null) {
-            KDocLoader.install(arguments.docOutputDir, environment.getMyEnvironment());
-        }
-
         // install any compiler plugins
         List<CompilerPlugin> plugins = arguments.getCompilerPlugins();
         if (plugins != null) {
-            environment.getMyEnvironment().getCompilerPlugins().addAll(plugins);
+            environment.getEnvironment().getCompilerPlugins().addAll(plugins);
         }
 
         if (arguments.stdlib != null) {
diff --git a/compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java b/compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java
index 02768269932..49592185078 100644
--- a/compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java
+++ b/compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java
@@ -221,8 +221,9 @@ public class CompileSession {
         List<CompilerPlugin> plugins = environment.getCompilerPlugins();
         if (!module) {
             if (plugins != null) {
+                CompilerPluginContext context = new CompilerPluginContext(project, bindingContext.getBindingContext(), getSourceFileNamespaces());
                 for (CompilerPlugin plugin : plugins) {
-                    plugin.processFiles(bindingContext.getBindingContext(), getSourceFileNamespaces());
+                    plugin.processFiles(context);
                 }
             }
         }