diff --git a/jenax-arq-parent/jenax-arq-connection-parent/jenax-arq-connection-core/src/main/java/org/aksw/jenax/dataaccess/sparql/link/query/IteratorDelegateWithWorkerThread.java b/jenax-arq-parent/jenax-arq-connection-parent/jenax-arq-connection-core/src/main/java/org/aksw/jenax/dataaccess/sparql/link/query/IteratorDelegateWithWorkerThread.java
index 109ad87a..3d10657a 100644
--- a/jenax-arq-parent/jenax-arq-connection-parent/jenax-arq-connection-core/src/main/java/org/aksw/jenax/dataaccess/sparql/link/query/IteratorDelegateWithWorkerThread.java
+++ b/jenax-arq-parent/jenax-arq-connection-parent/jenax-arq-connection-core/src/main/java/org/aksw/jenax/dataaccess/sparql/link/query/IteratorDelegateWithWorkerThread.java
@@ -57,8 +57,7 @@ protected Iterator<T> prefetch() throws Exception {
         return batch.isEmpty() ? null : batch.iterator();
     }
 
-    // FIXME The worker is blocked while retrieving so in that case
-    //  any close signal won't get through
+    // Note: The worker is blocked while retrieving so in that case any close signal won't get through
     @Override
     public void close() {
         helper.submit(() -> Iter.close(getDelegate()));
diff --git a/jenax-arq-parent/jenax-arq-plugins-parent/jenax-arq-plugins-service-vfs/src/main/java/org/aksw/jenax/arq/service/vfs/QueryIterRepeatApplyConcurrent.java b/jenax-arq-parent/jenax-arq-plugins-parent/jenax-arq-plugins-service-vfs/src/main/java/org/aksw/jenax/arq/service/vfs/QueryIterRepeatApplyConcurrent.java
index 34e7746b..37a48afe 100644
--- a/jenax-arq-parent/jenax-arq-plugins-parent/jenax-arq-plugins-service-vfs/src/main/java/org/aksw/jenax/arq/service/vfs/QueryIterRepeatApplyConcurrent.java
+++ b/jenax-arq-parent/jenax-arq-plugins-parent/jenax-arq-plugins-service-vfs/src/main/java/org/aksw/jenax/arq/service/vfs/QueryIterRepeatApplyConcurrent.java
@@ -223,7 +223,7 @@ private void scheduleNextTask() {
                 count++;
 
                 Binding binding = input.next();
-//                System.err.println(String.format("Thread %s: Starting task for: %s", Thread.currentThread().getName(), binding));
+                // System.err.println(String.format("Thread %s: Starting task for: %s", Thread.currentThread().getName(), binding));
                 ExecutionContext execCxt = getExecContext();
                 ExecutionContext isolatedExecCxt = new ExecutionContext(execCxt.getContext(), execCxt.getActiveGraph(), execCxt.getDataset(), execCxt.getExecutor());
                 Prefetch task = new Prefetch(binding, nextStage(binding, isolatedExecCxt));
diff --git a/jenax-bom/pom.xml b/jenax-bom/pom.xml
index 53d1eec0..73eb0656 100644
--- a/jenax-bom/pom.xml
+++ b/jenax-bom/pom.xml
@@ -223,6 +223,11 @@
 				<artifactId>jenax-resources-servicedescription</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.aksw.jenax</groupId>
+				<artifactId>jenax-resources-macros</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.aksw.jenax</groupId>
 				<artifactId>jenax-arq-connection-extra</artifactId>