diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsers/TestCasesParser.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsers/TestCasesParser.kt
index 1701f72d806..c7f5667b82f 100644
--- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsers/TestCasesParser.kt
+++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsers/TestCasesParser.kt
@@ -47,7 +47,11 @@ private fun SpecTestCase.save(
 }
 
 fun parseTestCases(testFiles: TestFiles): SpecTestCasesSet {
-    val testCasesSet = SpecTestCasesSet(mutableMapOf(), mutableMapOf(), mutableMapOf())
+    val testCasesSet = SpecTestCasesSet(
+        mutableMapOf<String, TestCasesByNumbers>(),
+        mutableMapOf<String, NavigableMap<Int, TestCasesByNumbers>>(),
+        mutableMapOf<Int, SpecTestCase>()
+    )
     var rangeOffset = 0
 
     for ((filename, fileContent) in testFiles) {
@@ -55,8 +59,8 @@ fun parseTestCases(testFiles: TestFiles): SpecTestCasesSet {
         var startFind = 0
 
         if (!testCasesSet.byFiles.contains(filename)) {
-            testCasesSet.byFiles[filename] = mutableMapOf()
-            testCasesSet.byRanges[filename] = TreeMap()
+            testCasesSet.byFiles[filename] = mutableMapOf<Int, SpecTestCase>()
+            testCasesSet.byRanges[filename] = TreeMap<Int, TestCasesByNumbers>()
         }
 
         val testCasesOfFile = testCasesSet.byFiles[filename]!!
diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/nullabilityAnalysis/constraints.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/nullabilityAnalysis/constraints.kt
index af086076a73..ba51bc2fa8b 100644
--- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/nullabilityAnalysis/constraints.kt
+++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/nullabilityAnalysis/constraints.kt
@@ -111,7 +111,7 @@ internal class GenericBoundType(
 
 internal class LiteralBoundType(val isNull: Boolean) : BoundType {
     override val classReference = LiteralClassReference
-    override val typeParameters = emptyList()
+    override val typeParameters: List<BoundTypeTypeParameter> = emptyList()
     override val forcedNullabilityTo: Nullability? = null
 }
 
@@ -174,7 +174,7 @@ internal data class BoundTypeTypeParameter(
 
 internal object StarProjectionBoundType : BoundType {
     override val classReference = UnknownClassReference("*")//TODO
-    override val typeParameters = emptyList()
+    override val typeParameters: List<BoundTypeTypeParameter> = emptyList()
     override val forcedNullabilityTo = null
 }
 
diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt
index 8da3571c7bd..9f5123ebc62 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt
@@ -412,7 +412,7 @@ class JavaToJKTreeBuilder constructor(
                 return qualifierExpression?.toJK() ?: JKStubExpressionImpl()
             }
 
-            val symbol = symbolProvider.provideSymbol(this)
+            val symbol = symbolProvider.provideSymbol<JKSymbol>(this)
             return when (symbol) {
                 is JKClassSymbol -> JKClassAccessExpressionImpl(symbol)
                 is JKFieldSymbol -> JKFieldAccessExpressionImpl(symbol)
@@ -677,7 +677,7 @@ class JavaToJKTreeBuilder constructor(
 
         fun PsiAnnotation.toJK(): JKAnnotation =
             JKAnnotationImpl(
-                symbolProvider.provideSymbol(nameReferenceElement!!).safeAs<JKClassSymbol>()
+                symbolProvider.provideSymbol<JKSymbol>(nameReferenceElement!!).safeAs<JKClassSymbol>()
                     ?: JKUnresolvedClassSymbol(nameReferenceElement!!.text),
                 parameterList.attributes.map { parameter ->
                     if (parameter.nameIdentifier != null) {
diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/CompositeConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/CompositeConversion.kt
index a124066aa2f..72e8aa1b3f0 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/CompositeConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/CompositeConversion.kt
@@ -51,7 +51,7 @@ internal inline fun sequentialPipe(crossinline configure: PipelineConversionBuil
 
 internal inline fun batchPipe(crossinline configure: PipelineConversionBuilder<BatchBaseConversion>.() -> Unit): BatchPipelineConversion {
     return BatchPipelineConversion(
-        PipelineConversionBuilder().apply(configure).conversions
+        PipelineConversionBuilder<BatchBaseConversion>().apply(configure).conversions
     )
 }
 
diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/symbols.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/symbols.kt
index a0b930e30e1..08f14ada51e 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/symbols.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/tree/impl/symbols.kt
@@ -308,7 +308,7 @@ fun JKSymbol.deepestFqName(): String? {
         when (this) {
             is PsiMethod -> (findDeepestSuperMethods().firstOrNull() ?: this).getKotlinFqName()?.asString()
             is KtNamedFunction -> findDeepestSuperMethodsNoWrapping(this).firstOrNull()?.getKotlinFqName()?.asString()
-            is JKMethod -> psi()?.deepestFqNameForTarget()
+            is JKMethod -> psi<PsiElement>()?.deepestFqNameForTarget()
             else -> null
         }
     return target.deepestFqNameForTarget() ?: fqName