diff --git a/lib/cartodb/backends/layer-stats/mapnik-layer-stats.js b/lib/cartodb/backends/layer-stats/mapnik-layer-stats.js
index fb62d532..4888d645 100644
--- a/lib/cartodb/backends/layer-stats/mapnik-layer-stats.js
+++ b/lib/cartodb/backends/layer-stats/mapnik-layer-stats.js
@@ -204,10 +204,11 @@ function _columnStats(ctx, columns, dimensions) {
                 Object.keys(dimensionsInfo).forEach(name => {
                     // Temporalily place dimensions info in stats.columns.__dimensions
                     stats.__dimensions = stats.__dimensions || {};
-                    stats.__dimensions[name] = stats.__dimensions[name] || Object.assign({}, dimensionsStats[name]);
+                    stats.__dimensions[name] = stats.__dimensions[name] || Object.assign({}, dimensionsStats[name]);
                     let type = null;
                     columnAggregations(dimensionsInfo[name]).forEach(fn => {
-                        type = type || fieldTypeSafe(ctx.dbConnection, res.fields.find(f => f.name === `${name}_${fn}`));
+                        type = type ||
+                            fieldTypeSafe(ctx.dbConnection, res.fields.find(f => f.name === `${name}_${fn}`));
                         stats.__dimensions[name][fn] = res.rows[0][`${name}_${fn}`];
                     });
                     stats.__dimensions[name].type = type;
diff --git a/lib/cartodb/models/aggregation/aggregation-query.js b/lib/cartodb/models/aggregation/aggregation-query.js
index fdd499f7..54a8e280 100644
--- a/lib/cartodb/models/aggregation/aggregation-query.js
+++ b/lib/cartodb/models/aggregation/aggregation-query.js
@@ -173,13 +173,16 @@ const dimensionNamesAndExpressions = (ctx) => {
 };
 
 const dimensionNames = (ctx, table) => {
-    return sep(dimensionNamesAndExpressions(ctx).map(([dimensionName, _]) => {
+    return sep(dimensionNamesAndExpressions(ctx).map(([dimensionName]) => {
         return table ? `${table}."${dimensionName}"` : `"${dimensionName}"`;
     }));
 };
 
 const dimensionDefs = ctx => {
-    return sep(dimensionNamesAndExpressions(ctx).map(([dimensionName, expression]) => `${expression.sql} AS "${dimensionName}"`));
+    return sep(
+        dimensionNamesAndExpressions(ctx)
+        .map(([dimensionName, expression]) => `${expression.sql} AS "${dimensionName}"`)
+    );
 };
 
 const aggregateFilters = ctx => ctx.filters || {};
diff --git a/lib/cartodb/models/aggregation/time-dimension.js b/lib/cartodb/models/aggregation/time-dimension.js
index 27f6de0c..6d1fe635 100644
--- a/lib/cartodb/models/aggregation/time-dimension.js
+++ b/lib/cartodb/models/aggregation/time-dimension.js
@@ -25,7 +25,7 @@ function timeExpression(t, tz) {
 }
 
 function epochWithDefaults(epoch) {
-    /* jshint maxcomplexity:8 */ // goddammit linter, I like this as is!!
+    /* jshint maxcomplexity:9 */ // goddammit linter, I like this as is!!
     const format = /^(\d\d\d\d)(?:\-?(\d\d)(?:\-?(\d\d)(?:[T\s]?(\d\d)(?:(\d\d)(?:\:(\d\d))?)?)?)?)?$/;
     const match  = (epoch || '').match(format) || [];
     const year   = match[1] || '0001';