diff --git a/platforms/core-configuration/file-collections/build.gradle.kts b/platforms/core-configuration/file-collections/build.gradle.kts
index a03e9cb0a746..71b3300eec97 100644
--- a/platforms/core-configuration/file-collections/build.gradle.kts
+++ b/platforms/core-configuration/file-collections/build.gradle.kts
@@ -4,13 +4,6 @@ plugins {
 
 description = "Implementation of types that represent containers of files"
 
-errorprone {
-    disabledChecks.addAll(
-        "HidingField", // 2 occurrences
-        "InlineMeSuggester", // 1 occurrences
-    )
-}
-
 dependencies {
     api(projects.javaLanguageExtensions)
     api(project(":base-services"))
diff --git a/platforms/core-configuration/file-collections/src/main/java/org/gradle/api/internal/file/AbstractFileCollection.java b/platforms/core-configuration/file-collections/src/main/java/org/gradle/api/internal/file/AbstractFileCollection.java
index 1b4484994f2d..4ff3afcdd490 100644
--- a/platforms/core-configuration/file-collections/src/main/java/org/gradle/api/internal/file/AbstractFileCollection.java
+++ b/platforms/core-configuration/file-collections/src/main/java/org/gradle/api/internal/file/AbstractFileCollection.java
@@ -67,7 +67,6 @@ protected AbstractFileCollection(TaskDependencyFactory taskDependencyFactory) {
         this(taskDependencyFactory, PatternSets.getNonCachingPatternSetFactory());
     }
 
-    @SuppressWarnings("deprecation")
     public AbstractFileCollection() {
         this(DefaultTaskDependencyFactory.withNoAssociatedProject());
     }
diff --git a/platforms/core-configuration/file-collections/src/main/java/org/gradle/api/internal/file/FileCollectionBackedFileTree.java b/platforms/core-configuration/file-collections/src/main/java/org/gradle/api/internal/file/FileCollectionBackedFileTree.java
index 1da2610e8d93..e3c05a5b39b8 100644
--- a/platforms/core-configuration/file-collections/src/main/java/org/gradle/api/internal/file/FileCollectionBackedFileTree.java
+++ b/platforms/core-configuration/file-collections/src/main/java/org/gradle/api/internal/file/FileCollectionBackedFileTree.java
@@ -36,11 +36,9 @@
 
 public class FileCollectionBackedFileTree extends AbstractFileTree {
     private final AbstractFileCollection collection;
-    private final TaskDependencyFactory taskDependencyFactory;
 
     public FileCollectionBackedFileTree(TaskDependencyFactory taskDependencyFactory, Factory<PatternSet> patternSetFactory, AbstractFileCollection collection) {
         super(taskDependencyFactory, patternSetFactory);
-        this.taskDependencyFactory = taskDependencyFactory;
         this.collection = collection;
     }
 
diff --git a/platforms/core-configuration/file-collections/src/main/java/org/gradle/api/internal/file/collections/LazilyInitializedFileCollection.java b/platforms/core-configuration/file-collections/src/main/java/org/gradle/api/internal/file/collections/LazilyInitializedFileCollection.java
index 0685a9d8ea3b..fc15568cfe87 100644
--- a/platforms/core-configuration/file-collections/src/main/java/org/gradle/api/internal/file/collections/LazilyInitializedFileCollection.java
+++ b/platforms/core-configuration/file-collections/src/main/java/org/gradle/api/internal/file/collections/LazilyInitializedFileCollection.java
@@ -35,6 +35,7 @@ public abstract class LazilyInitializedFileCollection extends CompositeFileColle
      * @deprecated Use the overload accepting the TaskDependencyFactory
      */
     @Deprecated
+    @SuppressWarnings("InlineMeSuggester")
     public LazilyInitializedFileCollection() {
         this(DefaultTaskDependencyFactory.withNoAssociatedProject());
     }
diff --git a/platforms/core-configuration/file-collections/src/main/java/org/gradle/api/internal/file/collections/UnpackingVisitor.java b/platforms/core-configuration/file-collections/src/main/java/org/gradle/api/internal/file/collections/UnpackingVisitor.java
index 2ef1b7dbc01d..dd2495a64257 100644
--- a/platforms/core-configuration/file-collections/src/main/java/org/gradle/api/internal/file/collections/UnpackingVisitor.java
+++ b/platforms/core-configuration/file-collections/src/main/java/org/gradle/api/internal/file/collections/UnpackingVisitor.java
@@ -78,7 +78,7 @@ public void add(@Nullable Object element) {
             return;
         }
         if (includeBuildable && (element instanceof Buildable || element instanceof TaskDependencyContainer)) {
-            visitor.accept(new BuildableElementFileCollection(element, resolver, patternSetFactory));
+            visitor.accept(new BuildableElementFileCollection(element, resolver, taskDependencyFactory, patternSetFactory));
             return;
         }
 
@@ -143,12 +143,11 @@ protected Set<File> getIntrinsicFiles() {
     private static class BuildableElementFileCollection extends CompositeFileCollection {
         private final Object element;
         private final PathToFileResolver resolver;
-        private final Factory<PatternSet> patternSetFactory;
 
-        public BuildableElementFileCollection(Object element, PathToFileResolver resolver, Factory<PatternSet> patternSetFactory) {
+        public BuildableElementFileCollection(Object element, PathToFileResolver resolver, TaskDependencyFactory taskDependencyFactory, Factory<PatternSet> patternSetFactory) {
+            super(taskDependencyFactory, patternSetFactory);
             this.element = element;
             this.resolver = resolver;
-            this.patternSetFactory = patternSetFactory;
         }
 
         @Override
diff --git a/platforms/core-configuration/input-tracking/build.gradle.kts b/platforms/core-configuration/input-tracking/build.gradle.kts
index 3760c7230e76..e5ca1f4e0d8c 100644
--- a/platforms/core-configuration/input-tracking/build.gradle.kts
+++ b/platforms/core-configuration/input-tracking/build.gradle.kts
@@ -4,13 +4,6 @@ plugins {
 
 description = "Configuration input discovery code"
 
-errorprone {
-    disabledChecks.addAll(
-        "HashtableContains",
-        "UnsynchronizedOverridesSynchronized", // 29 occurrences
-    )
-}
-
 dependencies {
     api(libs.jsr305)
     api(libs.guava)
diff --git a/platforms/core-configuration/input-tracking/src/main/java/org/gradle/internal/configuration/inputs/AccessTrackingProperties.java b/platforms/core-configuration/input-tracking/src/main/java/org/gradle/internal/configuration/inputs/AccessTrackingProperties.java
index 1df3ce1d9147..03ab9b376854 100644
--- a/platforms/core-configuration/input-tracking/src/main/java/org/gradle/internal/configuration/inputs/AccessTrackingProperties.java
+++ b/platforms/core-configuration/input-tracking/src/main/java/org/gradle/internal/configuration/inputs/AccessTrackingProperties.java
@@ -39,6 +39,8 @@
 /**
  * A wrapper for {@link Properties} that notifies a listener about accesses.
  */
+@SuppressWarnings("UnsynchronizedOverridesSynchronized")
+// TODO(mlopatkin) we need a better synchronization guarantees here. Just sprinkling synchronized won't help.
 public class AccessTrackingProperties extends Properties {
     /**
      * A listener that is notified about reads and modifications of the Properties instance.
@@ -334,7 +336,7 @@ public Object merge(Object key, Object value, BiFunction<? super Object, ? super
 
     @Override
     public boolean contains(Object value) {
-        return delegate.contains(value);
+        return delegate.containsValue(value);
     }
 
     @Override