diff --git a/bbmri/modules/ehds2-compose.yml b/bbmri/modules/ehds2-compose.yml
index 1af183d..7f250c1 100644
--- a/bbmri/modules/ehds2-compose.yml
+++ b/bbmri/modules/ehds2-compose.yml
@@ -56,7 +56,7 @@ services:
     command: bash -c " \
              echo listing /app/data && \
              ls -la /app/data && \
-             [ -f /app/data/*.[cC][sS][vV] ] && \
+             ls /app/data/*.[cC][sS][vV] 1> /dev/null 2>&1 && \
              [ ! -f /app/data/lock ] && \
              ( \
                  echo 'Wait for Blaze to finish initializing' ; \
@@ -78,5 +78,5 @@ services:
   test-data-loader:
     container_name: test-data-loader
     image: samply/test-data-loader
-    command: sh -c "sleep 300 && echo Listing all resources in FHIR store && blazectl --server http://bridgehead-bbmri-blaze:8080/fhir count-resources && tail -f /dev/null"
+    command: sh -c "sleep 400 && echo Listing all resources in FHIR store && blazectl --server http://bridgehead-bbmri-blaze:8080/fhir count-resources && tail -f /dev/null"