diff --git a/src/definitions/modules/calendar.js b/src/definitions/modules/calendar.js
index 533c13e0ab..4bfd2cfda2 100644
--- a/src/definitions/modules/calendar.js
+++ b/src/definitions/modules/calendar.js
@@ -421,7 +421,7 @@
                                     cell.data(metadata.date, cellDate);
                                     let adjacent = isDay && cellDate.getMonth() !== ((month + 12) % 12);
                                     let disabled = (!settings.selectAdjacentDays && adjacent) || !module.helper.isDateInRange(cellDate, mode) || settings.isDisabled(cellDate, mode) || module.helper.isDisabled(cellDate, mode) || !module.helper.isEnabled(cellDate, mode);
-                                    var eventDate;
+                                    let eventDate = null;
                                     if (disabled) {
                                         let disabledDate = module.helper.findDayAsObject(cellDate, mode, settings.disabledDates);
                                         if (disabledDate !== null && disabledDate[metadata.message]) {
diff --git a/tasks/admin/distributions/create.js b/tasks/admin/distributions/create.js
index 86d6837255..b6782ddceb 100644
--- a/tasks/admin/distributions/create.js
+++ b/tasks/admin/distributions/create.js
@@ -71,8 +71,8 @@ module.exports = function (callback) {
 
             // get files for meteor
             gatherFiles = function (dir) {
-                var
-                    dir   = dir || path.resolve('.'),
+                dir = dir || path.resolve('.');
+                let
                     list  = fs.readdirSync(dir),
                     omitted = [
                         '.git',
diff --git a/tasks/config/project/config.js b/tasks/config/project/config.js
index 27dd8eecad..66ce3998f5 100644
--- a/tasks/config/project/config.js
+++ b/tasks/config/project/config.js
@@ -17,7 +17,7 @@ let
 module.exports = {
 
     getPath: function (file, directory) {
-        var
+        let
             configPath,
             walk = function (directory) {
                 let
diff --git a/tasks/config/project/install.js b/tasks/config/project/install.js
index fa6053fe77..5c9a47da84 100644
--- a/tasks/config/project/install.js
+++ b/tasks/config/project/install.js
@@ -93,7 +93,7 @@ module.exports = {
 
     // checks if files are in a PM directory
     getPackageManager: function (directory) {
-        var
+        let
             // returns last matching result (avoid sub-module detection)
             walk = function (directory) {
                 let
@@ -133,7 +133,7 @@ module.exports = {
 
     // checks if files is PMed submodule
     isSubModule: function (directory) {
-        var
+        let
             moduleFolders = 0,
             walk = function (directory) {
                 let
diff --git a/tasks/docs/metadata.js b/tasks/docs/metadata.js
index ffa8447c76..98832e0b38 100644
--- a/tasks/docs/metadata.js
+++ b/tasks/docs/metadata.js
@@ -49,7 +49,7 @@ function parser(file, callback) {
     }
 
     try {
-        var
+        let
             /** @type {string} */
             text     = String(file.contents.toString('utf8')),
             lines    = text.split('\n'),
@@ -117,7 +117,7 @@ function parser(file, callback) {
             // console.log(meta);
         }
     } catch (error) {
-        console.log(error, filename);
+        console.log(error, file.path);
     }
 
     callback(null, file);