diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 96feff39b..f8ed7a6df 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -538,7 +538,7 @@ jobs:
           ./scripts/check_histogram_results.sh results/histograms.json $ERRORS_THRESHOLD
 
           # Running the monitor should create at least three files in the 'monitor' directory.
-          if ![ $(find "./results/monitor" -maxdepth 1 -mindepth 1 | wc -l) -gt 2]; then
+          if ! [ $(find "./results/monitor" -maxdepth 1 -mindepth 1 -type f | wc -l) -gt 2 ]; then
             echo "ERROR: Advanced monitoring unsuccessful, file directory and/or appropriate files not created." >&2
             exit 1
           fi
@@ -728,7 +728,7 @@ jobs:
           ./scripts/check_histogram_results.sh results/histograms.json $ERRORS_THRESHOLD
 
           # Running the monitor should create at least three files in the 'monitor' directory.
-          if ![ $(find "./results/monitor" -maxdepth 1 -mindepth 1 | wc -l) -gt 2]; then
+          if ! [ $(find "./results/monitor" -maxdepth 1 -mindepth 1 -type f | wc -l) -gt 2 ]; then
             echo "ERROR: Advanced monitoring unsuccessful, file directory and/or appropriate files not created." >&2
             exit 1
           fi
diff --git a/docker/build-run-benchmark-with-docker.sh b/docker/build-run-benchmark-with-docker.sh
index 7f90eca44..69b4d3723 100755
--- a/docker/build-run-benchmark-with-docker.sh
+++ b/docker/build-run-benchmark-with-docker.sh
@@ -87,12 +87,20 @@ if [ "${WITH_SERVICE_INTERRUPTIONS:-false}" == 'true' ]; then
     (sleep 10 && ./scripts/interrupt-docker-db-service.sh "$BENCHBASE_PROFILE") &
 fi
 
+if [ "${WITH_ADVANCED_MONITORING:-false}" == 'true' ]; then
+    # Run the benchmark with advanced monitoring enabled.
+    mt_args="-mt advanced"
+else
+    # Run the benchmark without monitoring.
+    mt_args=""
+fi
+
 rm -f results/histograms.json
 BUILD_IMAGE=false EXTRA_DOCKER_ARGS="--network=host $EXTRA_DOCKER_ARGS" \
 ./docker/benchbase/run-full-image.sh \
     --config "config/sample_${benchmark}_config.xml" --bench "$benchmark" \
     --create=false --load=false --execute=true \
-    --sample 1 --interval-monitor 1000 \
+    --sample 1 --interval-monitor 1000 $mt_args \
     --json-histograms results/histograms.json
 rc=$?
 wait    # for the interrupt script, if any
diff --git a/src/main/java/com/oltpbenchmark/api/collectors/monitoring/PostgreSQLMonitor.java b/src/main/java/com/oltpbenchmark/api/collectors/monitoring/PostgreSQLMonitor.java
index 6248450bd..8e8d64bb6 100644
--- a/src/main/java/com/oltpbenchmark/api/collectors/monitoring/PostgreSQLMonitor.java
+++ b/src/main/java/com/oltpbenchmark/api/collectors/monitoring/PostgreSQLMonitor.java
@@ -134,6 +134,7 @@ protected void runExtraction() {
 
   @Override
   protected void writeSystemMetrics() {
+    // TODO
     return;
   }
 }