diff --git a/dspace-api/src/main/java/org/dspace/core/Email.java b/dspace-api/src/main/java/org/dspace/core/Email.java
index 1df4c570cac5..ee3d2c9bdf34 100644
--- a/dspace-api/src/main/java/org/dspace/core/Email.java
+++ b/dspace-api/src/main/java/org/dspace/core/Email.java
@@ -701,6 +701,7 @@ private static class BurstDelayQueue extends DelayQueue<DelayedEmail> {
         public BurstDelayQueue(int burstSize){
             super();
             this.burstSize = burstSize;
+	    log.info("BurstDelayQueue initiated with burstSize=" + burstSize);
         }
 
         @Override
diff --git a/utilities/project_helpers/scripts/makefile b/utilities/project_helpers/scripts/makefile
index 91d5b49f5910..45b3f1a53491 100644
--- a/utilities/project_helpers/scripts/makefile
+++ b/utilities/project_helpers/scripts/makefile
@@ -440,4 +440,4 @@ migrate_databases:
 	./migrate_db.sh $(UTILITIES_DATABASE_NAME)
 
 generate_piwik_reports:
-	LC_ALL=en_US.UTF-8 $(DSPACE_BIN) piwik-report-generator
+	LC_ALL=en_US.UTF-8 JAVA_OPTS="-Xmx2048m -Dfile.encoding=UTF-8 -Ddspace.lr.email.burst=32768" $(DSPACE_BIN) piwik-report-generator