diff --git a/community/logging/src/test/java/org/neo4j/logging/AssertableLogProvider.java b/community/logging/src/test/java/org/neo4j/logging/AssertableLogProvider.java
index acd650dc445d9..fa5ed48234ca5 100644
--- a/community/logging/src/test/java/org/neo4j/logging/AssertableLogProvider.java
+++ b/community/logging/src/test/java/org/neo4j/logging/AssertableLogProvider.java
@@ -641,7 +641,7 @@ public void assertNoLogCallContaining( String partOfMessage )
 
     public void assertLogStringContains( String partOfMessage )
     {
-        synchronized (logCalls)
+        synchronized ( logCalls )
         {
             for ( LogCall logCall : logCalls )
             {
diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/monitoring/tracing/VerbosePageCacheTracer.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/monitoring/tracing/VerbosePageCacheTracer.java
index d6c89aaaf8616..c6bf20c0c6212 100644
--- a/enterprise/kernel/src/main/java/org/neo4j/kernel/monitoring/tracing/VerbosePageCacheTracer.java
+++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/monitoring/tracing/VerbosePageCacheTracer.java
@@ -234,7 +234,7 @@ private class VerboseFlushOpportunity implements FlushEventOpportunity
         }
 
         @Override
-        public FlushEvent beginFlush( long filePageId, int cachePageId, PageSwapper swapper )
+        public FlushEvent beginFlush( long filePageId, long cachePageId, PageSwapper swapper )
         {
             long now = clock.nanos();
             long opportunityIntervalNanos = now - lastReportingTime;
diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/monitoring/tracing/VerboseTracerFactory.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/monitoring/tracing/VerboseTracerFactory.java
index cefecb06ae8a3..dcfffe10862f3 100644
--- a/enterprise/kernel/src/main/java/org/neo4j/kernel/monitoring/tracing/VerboseTracerFactory.java
+++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/monitoring/tracing/VerboseTracerFactory.java
@@ -21,9 +21,9 @@
 
 import org.neo4j.helpers.Service;
 import org.neo4j.io.pagecache.tracing.PageCacheTracer;
-import org.neo4j.kernel.impl.util.JobScheduler;
 import org.neo4j.kernel.monitoring.Monitors;
 import org.neo4j.logging.Log;
+import org.neo4j.scheduler.JobScheduler;
 import org.neo4j.time.SystemNanoClock;
 
 @Service.Implementation( TracerFactory.class )
diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/monitoring/tracing/VerbosePageCacheTracerTest.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/monitoring/tracing/VerbosePageCacheTracerTest.java
index 11a217e23011f..aecef9d2f2ed7 100644
--- a/enterprise/kernel/src/test/java/org/neo4j/kernel/monitoring/tracing/VerbosePageCacheTracerTest.java
+++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/monitoring/tracing/VerbosePageCacheTracerTest.java
@@ -65,7 +65,7 @@ public void traceSinglePageCacheFlush()
         try ( MajorFlushEvent majorFlushEvent = tracer.beginCacheFlush() )
         {
             FlushEventOpportunity flushEventOpportunity = majorFlushEvent.flushEventOpportunity();
-            FlushEvent flushEvent = flushEventOpportunity.beginFlush( 1, 2, new DummyPageSwapper( "testFile" ) );
+            FlushEvent flushEvent = flushEventOpportunity.beginFlush( 1, 2, new DummyPageSwapper( "testFile", 1 ) );
             flushEvent.addBytesWritten( 2 );
             flushEvent.addPagesFlushed( 7 );
             flushEvent.done();
@@ -82,7 +82,7 @@ public void evictionDoesNotInfluenceFlushNumbers()
         try ( MajorFlushEvent majorFlushEvent = tracer.beginCacheFlush() )
         {
             FlushEventOpportunity flushEventOpportunity = majorFlushEvent.flushEventOpportunity();
-            FlushEvent flushEvent = flushEventOpportunity.beginFlush( 1, 2, new DummyPageSwapper( "testFile" ) );
+            FlushEvent flushEvent = flushEventOpportunity.beginFlush( 1, 2, new DummyPageSwapper( "testFile", 1 ) );
             clock.forward( 2, TimeUnit.MILLISECONDS );
 
             try ( EvictionRunEvent evictionRunEvent = tracer.beginPageEvictions( 5 ) )
@@ -90,7 +90,8 @@ public void evictionDoesNotInfluenceFlushNumbers()
                 try ( EvictionEvent evictionEvent = evictionRunEvent.beginEviction() )
                 {
                     FlushEventOpportunity evictionEventOpportunity = evictionEvent.flushEventOpportunity();
-                    FlushEvent evictionFlush = evictionEventOpportunity.beginFlush( 2, 3, new DummyPageSwapper( "evictionFile" ) );
+                    FlushEvent evictionFlush = evictionEventOpportunity.beginFlush( 2, 3,
+                            new DummyPageSwapper( "evictionFile", 1 ) );
                     evictionFlush.addPagesFlushed( 10 );
                     evictionFlush.addPagesFlushed( 100 );
                 }
@@ -108,7 +109,7 @@ public void evictionDoesNotInfluenceFlushNumbers()
     public void traceFileFlush()
     {
         VerbosePageCacheTracer tracer = createTracer();
-        DummyPageSwapper swapper = new DummyPageSwapper( "fileToFlush" );
+        DummyPageSwapper swapper = new DummyPageSwapper( "fileToFlush", 1 );
         try ( MajorFlushEvent fileToFlush = tracer.beginFileFlush( swapper ) )
         {
             FlushEventOpportunity flushEventOpportunity = fileToFlush.flushEventOpportunity();