diff --git a/plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js b/plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js
index b499c9f78b64cc8ef6974d755ea48dabd6512980..d5a9f7363f1b97adf038581ac90e2ca1a8050dc0 100644
--- a/plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js
+++ b/plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js
@@ -55,7 +55,7 @@
      */
     var TrackingCodeGenerator = function () {
         // empty
-    }
+    };
 
     var TrackingCodeGeneratorSingleton = exports.TrackingCodeGenerator = new TrackingCodeGenerator();
 
@@ -285,7 +285,7 @@
                 actionName: $('#image-tracker-action-name').val(),
                 piwikHost: piwikHost,
                 piwikPath: piwikPath
-            }
+            };
 
             if ($('#image-tracking-goal-check').is(':checked')) {
                 generateDataParams.idGoal = $('#image-tracker-goal').val();
diff --git a/plugins/CoreHome/javascripts/notification.js b/plugins/CoreHome/javascripts/notification.js
index c89aca6b3364ba42c87646251e116f985f59a213..6c68f71a0a40f414457efffa5b09d9c4641223dc 100644
--- a/plugins/CoreHome/javascripts/notification.js
+++ b/plugins/CoreHome/javascripts/notification.js
@@ -86,7 +86,7 @@
             return;
         }
 
-        var $existingNode = $('.system.notification[data-id=' + options.id + ']')
+        var $existingNode = $('.system.notification[data-id=' + options.id + ']');
         if ($existingNode && $existingNode.length) {
             $existingNode.remove();
         }
diff --git a/plugins/CoreHome/javascripts/siteselector/siteselector-controller.js b/plugins/CoreHome/javascripts/siteselector/siteselector-controller.js
index b7c3b1551b009c861edb622cf821800fdefd65bd..60f75eead037182c3debd627510ef958b6bf8a91 100644
--- a/plugins/CoreHome/javascripts/siteselector/siteselector-controller.js
+++ b/plugins/CoreHome/javascripts/siteselector/siteselector-controller.js
@@ -36,9 +36,9 @@ angular.module('piwikApp').controller('SiteSelectorController', function($scope,
     };
 
     $scope.getUrlAllSites = function () {
-        var newParameters = 'module=MultiSites&action=index'
+        var newParameters = 'module=MultiSites&action=index';
         return piwik.helper.getCurrentQueryStringWithParametersModified(newParameters);
-    }
+    };
     $scope.getUrlForSiteId = function (idSite) {
         var idSiteParam   = 'idSite=' + idSite;
         var newParameters = 'segment=&' + idSiteParam;
diff --git a/plugins/CorePluginsAdmin/javascripts/plugins.js b/plugins/CorePluginsAdmin/javascripts/plugins.js
index ae3fcfa04c32411465fce01cbaf6f64001a225c2..5114fc1811cd0cd5855e84928043997d23449096 100644
--- a/plugins/CorePluginsAdmin/javascripts/plugins.js
+++ b/plugins/CorePluginsAdmin/javascripts/plugins.js
@@ -28,12 +28,12 @@ $(document).ready(function () {
         var filterStatus = getCurrentFilterStatus();
 
         updateNumberOfMatchingPluginsInFilter('[data-filter-status="all"]', filterOrigin, 'all');
-        updateNumberOfMatchingPluginsInFilter('[data-filter-status="active"]', filterOrigin, 'active')
-        updateNumberOfMatchingPluginsInFilter('[data-filter-status="inactive"]', filterOrigin, 'inactive')
+        updateNumberOfMatchingPluginsInFilter('[data-filter-status="active"]', filterOrigin, 'active');
+        updateNumberOfMatchingPluginsInFilter('[data-filter-status="inactive"]', filterOrigin, 'inactive');
 
-        updateNumberOfMatchingPluginsInFilter('[data-filter-origin="all"]', 'all', filterStatus)
-        updateNumberOfMatchingPluginsInFilter('[data-filter-origin="core"]', 'core', filterStatus)
-        updateNumberOfMatchingPluginsInFilter('[data-filter-origin="noncore"]', 'noncore', filterStatus)
+        updateNumberOfMatchingPluginsInFilter('[data-filter-origin="all"]', 'all', filterStatus);
+        updateNumberOfMatchingPluginsInFilter('[data-filter-origin="core"]', 'core', filterStatus);
+        updateNumberOfMatchingPluginsInFilter('[data-filter-origin="noncore"]', 'noncore', filterStatus);
     }
 
     function updateNumberOfMatchingPluginsInFilter(selectorFilterToUpdate, filterOrigin, filterStatus)
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 8c0e8d3f9b772ca0e0ea9d1d23a582e85654b0be..f5067dea90751914914c0fbc3fcac8b5c116d33c 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -55,7 +55,7 @@ class Controller extends \Piwik\Plugin\Controller
      * Default action
      *
      * @param none
-     * @return void
+     * @return string
      */
     function index()
     {
diff --git a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js b/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js
index 2f352456ed12efe0dd82783172acd8fe3a7e4b21..a0c36fc33f8a1a07d338747b3ae43af9d5e43bb3 100644
--- a/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js
+++ b/plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js
@@ -33,7 +33,7 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp
     model.totalRevenue = '?';
     model.searchTerm   = '';
     model.lastVisits   = '?';
-    model.lastVisitsDate = '?'
+    model.lastVisitsDate = '?';
 
     fetchPreviousSummary();
 
@@ -141,15 +141,15 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp
 
     model.getNumberOfFilteredSites = function () {
         return model.sites.length;
-    }
+    };
 
     model.getNumberOfPages = function () {
         return Math.ceil(model.sites.length / model.pageSize - 1);
-    }
+    };
 
     model.getCurrentPagingOffsetStart = function() {
         return Math.ceil(model.currentPage * model.pageSize);
-    }
+    };
 
     model.getCurrentPagingOffsetEnd = function() {
         var end = model.getCurrentPagingOffsetStart() + parseInt(model.pageSize, 10);
@@ -157,7 +157,7 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp
             end = model.sites.length
         }
         return parseInt(end, 10);
-    }
+    };
 
     model.previousPage = function () {
         model.currentPage = model.currentPage - 1;
@@ -194,7 +194,7 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp
         model.searchTerm  = term;
         model.currentPage = 0;
         model.sites       = nestedSearch(allSitesByGroup, term);
-    }
+    };
 
     function fetchPreviousSummary () {
         piwikApi.fetch({
diff --git a/plugins/MultiSites/javascripts/multisites-site/multisites-site-directive.js b/plugins/MultiSites/javascripts/multisites-site/multisites-site-directive.js
index 1ad821b39040dc75ec1d43b2068fcc2fcdde784f..14875dd3f6cad199192eecc428eb07c40d6c3f2c 100644
--- a/plugins/MultiSites/javascripts/multisites-site/multisites-site-directive.js
+++ b/plugins/MultiSites/javascripts/multisites-site/multisites-site-directive.js
@@ -38,7 +38,7 @@ angular.module('piwikApp').directive('piwikMultisitesSite', function($document,
 
             this.getWebsite = function () {
                 return $scope.website;
-            }
+            };
 
             $scope.sparklineImage = function(website){
                 var append = '';
diff --git a/plugins/UsersManager/javascripts/usersManager.js b/plugins/UsersManager/javascripts/usersManager.js
index 1b88d2203019232c59e72010ee7d51a87ea4fd59..e7b0be4a02d0139b8679b257c1a01db16761db51 100644
--- a/plugins/UsersManager/javascripts/usersManager.js
+++ b/plugins/UsersManager/javascripts/usersManager.js
@@ -143,7 +143,7 @@ function bindUpdateSuperUserAccess() {
     }
 
     message = _pk_translate(message);
-    message = message.replace('%s', login)
+    message = message.replace('%s', login);
 
     $('#superUserAccessConfirm h2').text(message);