diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java
index 29f6c37d6cf..41681950920 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java
@@ -303,13 +303,11 @@ public class ClosureCodegen extends GenerationStateAware {
     }
 
     private static FunctionDescriptor getInvokeFunction(FunctionDescriptor funDescriptor) {
-        FunctionDescriptor interfaceFunction;
         int paramCount = funDescriptor.getValueParameters().size();
         KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
         ClassDescriptor funClass = funDescriptor.getReceiverParameter() == null
                                    ? builtIns.getFunction(paramCount)
                                    : builtIns.getExtensionFunction(paramCount);
-        interfaceFunction = funClass.getDefaultType().getMemberScope().getFunctions(Name.identifier("invoke")).iterator().next();
-        return interfaceFunction;
+        return funClass.getDefaultType().getMemberScope().getFunctions(Name.identifier("invoke")).iterator().next();
     }
 }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java
index 38d40e106b1..91aeb166966 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java
@@ -25,7 +25,10 @@ import org.jetbrains.jet.codegen.context.CodegenContext;
 import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.codegen.state.GenerationStateAware;
 import org.jetbrains.jet.codegen.state.JetTypeMapperMode;
-import org.jetbrains.jet.lang.descriptors.*;
+import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
+import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
 import org.jetbrains.jet.lang.psi.JetCallExpression;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.resolve.BindingContext;
@@ -75,7 +78,7 @@ public class SamWrapperCodegen extends GenerationStateAware {
                        ACC_FINAL,
                        name.getInternalName(),
                        null,
-                       JvmClassName.byType(OBJECT_TYPE).getInternalName(),
+                       OBJECT_TYPE.getInternalName(),
                        new String[]{JvmClassName.byClassDescriptor(samInterface).getInternalName()}
         );
         cv.visitSource(callExpression.getContainingFile().getName(), null);