diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CallGenerator.java b/compiler/backend/src/org/jetbrains/jet/codegen/CallGenerator.java
index 951a43c3db1..c0f64a1c5b2 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/CallGenerator.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/CallGenerator.java
@@ -24,9 +24,9 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
 
 public interface CallGenerator {
 
-    public class DefaultCallGenerator implements CallGenerator {
+    class DefaultCallGenerator implements CallGenerator {
 
-        private ExpressionCodegen codegen;
+        private final ExpressionCodegen codegen;
 
         public DefaultCallGenerator(ExpressionCodegen codegen) {
             this.codegen = codegen;
@@ -72,7 +72,7 @@ public interface CallGenerator {
         ) {
             stackValue.put(stackValue.type, codegen.v);
         }
-    };
+    }
 
     void genCall(CallableMethod callableMethod, ResolvedCall<?> resolvedCall, int mask, ExpressionCodegen codegen);
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InliningContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InliningContext.java
index ef85eaf942a..3dcabe47a0d 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InliningContext.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InliningContext.java
@@ -100,7 +100,7 @@ public class InliningContext {
     }
 
     public boolean isRoot() {
-        return parent == null;
+        return false;
     }
 
     @NotNull