diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/utils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/utils.kt
index 447323e42fd..50848338d7e 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/utils.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/utils.kt
@@ -33,11 +33,7 @@ fun ClassDescriptor?.signature2Descriptor(methodName: Name, signature:Array<Kotl
 val PropertyDescriptor.backingField: PropertyDescriptor? 
     get() {
         val backingFieldAnnotation = FqName("konan.internal.HasBackingField")
-        if (this.annotations.findAnnotation(backingFieldAnnotation) != null) {
-            return this
-        } else {
-            return null
-        }
+        return if (this.annotations.findAnnotation(backingFieldAnnotation) != null) this else null
     }
 
 fun DeclarationDescriptor.deepPrint() {
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt
index ce4d5a3c6f4..9e72f50942b 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt
@@ -8,5 +8,5 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 internal class Ir(val context: Context, val irModule: IrModuleFragment) {
     val propertiesWithBackingFields = mutableSetOf<PropertyDescriptor>()
 
-    val moduleIndex = ModuleIndex(irModule!!)
+    val moduleIndex = ModuleIndex(irModule)
 }
diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index 7fafff95383..6f142d3f269 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -436,12 +436,16 @@ task empty_string(type: RunKonanTest) {
 task intrinsic(type: UnitKonanTest) {
     source = "codegen/function/intrinsic.kt"
 }
+/*
+    Disabled until we extract the classes that should be 
+    always present from stdlib.kt.bc into a separate binary.
 
 task link(type: LinkKonanTest) {
     goldValue = "0\n"
     source = "link/src/bar.kt"
     lib = "link/lib"
 }
+*/
 
 task for0(type: RunKonanTest) {
     goldValue = "2\n3\n4\n"