diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt
index c1354b6d2ed..992f85bcdeb 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt
@@ -139,8 +139,8 @@ internal class KtFirScopeProvider(
                 project,
                 builder,
                 token,
-                analysisSession.searchScope,
-                analysisSession.targetPlatform
+                GlobalSearchScope.allScope(project), // TODO
+                analysisSession.targetPlatform,
             )
         }
     }
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbol.kt
index 254b8a6315e..4dace24b53e 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbol.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbol.kt
@@ -26,11 +26,10 @@ internal interface KtFirSymbol<out F : FirDeclaration> : KtSymbol, ValidityToken
 
 internal fun KtFirSymbol<*>.symbolEquals(other: Any?): Boolean {
     if (other !is KtFirSymbol<*>) return false
-    if (this.token != other.token) return false
     return this.firRef == other.firRef
 }
 
-internal fun KtFirSymbol<*>.symbolHashCode(): Int = firRef.hashCode() * 31 + token.hashCode()
+internal fun KtFirSymbol<*>.symbolHashCode(): Int = firRef.hashCode()
 
 internal tailrec fun FirDeclaration.ktSymbolOrigin(): KtSymbolOrigin = when (origin) {
     FirDeclarationOrigin.Source -> {
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/types/FirKtType.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/types/FirKtType.kt
index babc26ff4e6..6e542dd196c 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/types/FirKtType.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/types/FirKtType.kt
@@ -30,11 +30,10 @@ internal interface KtFirType : ValidityTokenOwner {
 
 private fun KtFirType.typeEquals(other: Any?): Boolean {
     if (other !is KtFirType) return false
-    if (this.token != other.token) return false
     return this.coneType == other.coneType
 }
 
-private fun KtFirType.typeHashcode(): Int = token.hashCode() * 31 + coneType.hashCode()
+private fun KtFirType.typeHashcode(): Int = coneType.hashCode()
 
 internal class KtFirUsualClassType(
     override val coneType: ConeClassLikeTypeImpl,
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/KtAnalysisSessionFe10BindingHolder.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/KtAnalysisSessionFe10BindingHolder.kt
index 678081af744..9ebac680ff5 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/KtAnalysisSessionFe10BindingHolder.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/utils/KtAnalysisSessionFe10BindingHolder.kt
@@ -47,9 +47,9 @@ class KtAnalysisSessionFe10BindingHolder private constructor(
 
     companion object {
         @InvalidWayOfUsingAnalysisSession
-        fun create(firResolveState: FirModuleResolveState, token: ValidityToken, ktElement: KtElement): KtAnalysisSessionFe10BindingHolder {
+        fun create(firResolveState: FirModuleResolveState, token: ValidityToken, @Suppress("UNUSED_PARAMETER") ktElement: KtElement): KtAnalysisSessionFe10BindingHolder {
             @Suppress("DEPRECATION")
-            val firAnalysisSession = KtFirAnalysisSession.createAnalysisSessionByResolveState(firResolveState, token, ktElement)
+            val firAnalysisSession = KtFirAnalysisSession.createAnalysisSessionByResolveState(firResolveState, token)
             return KtAnalysisSessionFe10BindingHolder(firAnalysisSession)
         }
     }