diff --git a/build.xml b/build.xml
index 1d84087bfd..27794c4c26 100644
--- a/build.xml
+++ b/build.xml
@@ -44,7 +44,7 @@
    <arg line="${source_comma_sep}
               xml
               codesize,design,naming,unusedcode
-              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,PMAStandard,phpseclib,recaptchalib.php,swekey.php
+              --exclude lib/Cake/,vendors/
               --reportfile '${basedir}/build/logs/pmd.xml'" />
   </exec>
  </target>
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 543c121b21..53a84d6465 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -3195,7 +3195,7 @@ function PMA_getHtmlForListingUsersofAGroup($userGroup)
     if ($result) {
         if ($GLOBALS['dbi']->numRows($result) == 0) {
             $html_output .= '<p>'
-                . __('No users were found belonging to this user group')
+                . __('No users were found belonging to this user group.')
                 . '</p>';
         } else {
             $html_output .= '<table>'
@@ -3367,7 +3367,7 @@ function PMA_getHtmlToEditUserGroup($userGroup = null)
         . '</legend>';
 
     if ($userGroup == null) {
-        $html_output .= '<label for="userGroup">' . __('Group name: ') . '</label>';
+        $html_output .= '<label for="userGroup">' . __('Group name:') . '</label>';
         $html_output .= '<input type="text" name="userGroup" autocomplete="off" />';
         $html_output .= '<div class="clearfloat"></div>';
     }
@@ -3399,7 +3399,7 @@ function PMA_getHtmlToEditUserGroup($userGroup = null)
     }
 
     $html_output .= _getTabList(
-        __('Sever level tabs'), 'server', $allowedTabs['server']
+        __('Server level tabs'), 'server', $allowedTabs['server']
     );
     $html_output .= _getTabList(
         __('Database level tabs'), 'db', $allowedTabs['db']