diff --git a/runtime/src/html/pgadmin.html b/runtime/src/html/pgadmin.html
index 62c7dc8c8..998fbab63 100644
--- a/runtime/src/html/pgadmin.html
+++ b/runtime/src/html/pgadmin.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
   <head>
     <title>pgAdmin 4</title>
     <style>
diff --git a/runtime/src/js/pgadmin.js b/runtime/src/js/pgadmin.js
index 57c711d19..7829f6b99 100644
--- a/runtime/src/js/pgadmin.js
+++ b/runtime/src/js/pgadmin.js
@@ -286,7 +286,7 @@ splashWindow.on('loaded', function() {
         startDesktopMode();
       })
       .catch((errCode) => {
-        if (fixedPortCheck && errCode == 'EADDRINUSE') {
+        if (errCode == 'EADDRINUSE') {
           alert('The specified fixed port is already in use. Please provide any other valid port.');
         } else {
           alert(errCode);
diff --git a/web/pgAdmin4.py b/web/pgAdmin4.py
index f027050f5..d2bd1af6f 100644
--- a/web/pgAdmin4.py
+++ b/web/pgAdmin4.py
@@ -111,8 +111,7 @@ else:
 # Flask default.
 app.PGADMIN_RUNTIME = False
 app.logger.debug(
-    'Server mode: %s, config server mode: %s',
-    SERVER_MODE, config.SERVER_MODE
+    'Config server mode: %s', config.SERVER_MODE
 )
 config.EFFECTIVE_SERVER_PORT = None
 if 'PGADMIN_INT_PORT' in os.environ:
diff --git a/web/pgadmin/authenticate/__init__.py b/web/pgadmin/authenticate/__init__.py
index 1fdb66cf7..bc0868ddf 100644
--- a/web/pgadmin/authenticate/__init__.py
+++ b/web/pgadmin/authenticate/__init__.py
@@ -129,7 +129,7 @@ class AuthSourceManager():
         self.current_source = source
 
     @property
-    def get_current_source(self, source):
+    def get_current_source(self):
         return self.current_source
 
     def set_source(self, source):
@@ -174,13 +174,11 @@ class AuthSourceManager():
             # OR When kerberos authentication failed while accessing pgadmin,
             # we need to break the loop as no need to authenticate further
             # even if the authentication sources set to multiple
-            if not status:
-                if (hasattr(msg, 'status') and
-                    msg.status == '401 UNAUTHORIZED') or\
-                        (source.get_source_name() ==
-                         KERBEROS and
-                         request.method == 'GET'):
-                    break
+            if not status and (hasattr(msg, 'status') and
+                               msg.status == '401 UNAUTHORIZED') or \
+                (source.get_source_name() == KERBEROS and
+                 request.method == 'GET'):
+                break
 
             if status:
                 self.set_source(source)
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py
index 5036a2ad0..bd8c9600b 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py
@@ -290,9 +290,8 @@ class SchemaView(PGChildNodeView):
 
         # Privileges
         for aclcol in acls:
-            if specific is not None:
-                if aclcol not in specific:
-                    continue
+            if specific is not None and aclcol not in specific:
+                continue
             if aclcol in data:
                 allowedacl = acls[aclcol]
                 if modified:
diff --git a/web/pgadmin/browser/static/scss/_quick_search.scss b/web/pgadmin/browser/static/scss/_quick_search.scss
index ea90a62d2..d16f290b4 100644
--- a/web/pgadmin/browser/static/scss/_quick_search.scss
+++ b/web/pgadmin/browser/static/scss/_quick_search.scss
@@ -77,9 +77,8 @@
 .menu-groups-a{
   display:flex !important;
   flex-direction:column;
-  padding: 6px;
-  color: $dropdown-link-color;
   padding: 6px 16px;
+  color: $dropdown-link-color;
 }
 
 .menu-groups-a span{
diff --git a/web/pgadmin/tools/erd/__init__.py b/web/pgadmin/tools/erd/__init__.py
index 97a04d3da..8294a31a9 100644
--- a/web/pgadmin/tools/erd/__init__.py
+++ b/web/pgadmin/tools/erd/__init__.py
@@ -561,7 +561,6 @@ def sql(trans_id, sgid, sid, did):
 @login_required
 def tables(trans_id, sgid, sid, did):
     helper = ERDHelper(trans_id, sid, did)
-    conn = _get_connection(sid, did, trans_id)
     status, tables = helper.get_all_tables()
 
     if not status:
diff --git a/web/pgadmin/tools/erd/static/js/erd_tool/ui_components/FloatingNote.jsx b/web/pgadmin/tools/erd/static/js/erd_tool/ui_components/FloatingNote.jsx
index 052829f93..b8a0eba88 100644
--- a/web/pgadmin/tools/erd/static/js/erd_tool/ui_components/FloatingNote.jsx
+++ b/web/pgadmin/tools/erd/static/js/erd_tool/ui_components/FloatingNote.jsx
@@ -11,7 +11,6 @@ import React, { useEffect, useState } from 'react';
 import Tippy from '@tippyjs/react';
 import gettext from 'sources/gettext';
 import PropTypes from 'prop-types';
-import { TableNodeModel } from '../nodes/TableNode';
 import CustomPropTypes from 'sources/custom_prop_types';
 
 /* The note component of ERD. It uses tippy to create the floating note */
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index 60dbe897c..d9ffd27ca 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -8,7 +8,7 @@
 //////////////////////////////////////////////////////////////
 /* This is used to change publicPath of webpack at runtime for loading chunks */
 /* eslint-disable */
-__webpack_public_path__ = window.resourceBasePath;
+let __webpack_public_path__ = window.resourceBasePath;
 /* eslint-enable */
 
 import {launchDataGrid} from 'tools/datagrid/static/js/show_query_tool';
diff --git a/web/pgadmin/tools/user_management/__init__.py b/web/pgadmin/tools/user_management/__init__.py
index f202f898b..15a1b6732 100644
--- a/web/pgadmin/tools/user_management/__init__.py
+++ b/web/pgadmin/tools/user_management/__init__.py
@@ -438,8 +438,9 @@ def change_owner():
             data={}
         )
     except Exception as e:
+        msg = 'Unable to update shared server owner' + _(str(e))
         return internal_server_error(
-            errormsg='Unable to update shared server owner')
+            errormsg=msg)
 
 
 @blueprint.route(
