diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java
index d5f9bba60e1..cc7e0e84df3 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java
@@ -174,9 +174,6 @@ public class InjectorForLazyBodyResolve {
         this.overrideResolver = new OverrideResolver();
         this.varianceChecker = new VarianceChecker(bindingTrace);
 
-        scopeProvider.setAdditionalFileScopesProvider(additionalFileScopeProvider);
-        scopeProvider.setDeclarationScopeProvider(declarationScopeProvider);
-
         this.lazyTopDownAnalyzerForTopLevel.setKotlinCodeAnalyzer(analyzer);
         this.lazyTopDownAnalyzerForTopLevel.setLazyTopDownAnalyzer(lazyTopDownAnalyzer);
 
diff --git a/generators/injector-generator/src/org/jetbrains/kotlin/generators/di/InjectionLogicGenerator.java b/generators/injector-generator/src/org/jetbrains/kotlin/generators/di/InjectionLogicGenerator.java
index 22e105a1546..a8e5e1fdbec 100644
--- a/generators/injector-generator/src/org/jetbrains/kotlin/generators/di/InjectionLogicGenerator.java
+++ b/generators/injector-generator/src/org/jetbrains/kotlin/generators/di/InjectionLogicGenerator.java
@@ -97,6 +97,7 @@ public abstract class InjectionLogicGenerator {
 
         // Call setters
         for (Field field : fields) {
+            if (!(field.getInitialization() instanceof ConstructorCall)) continue;
             for (SetterDependency dependency : field.getDependencies()) {
                 String prefix = prefixForSetterCall(field);
                 String dependencyName = dependency.getDependency().getName();