diff --git a/swh/core/cli/__init__.py b/swh/core/cli/__init__.py
--- a/swh/core/cli/__init__.py
+++ b/swh/core/cli/__init__.py
@@ -7,23 +7,26 @@
 import logging
 import pkg_resources
 
-logger = logging.getLogger(__name__)
-
+LOG_LEVEL_NAMES = ['NOTSET', 'WARN', 'DEBUG', 'CRITICAL', 'WARNING',
+                   'ERROR', 'INFO']
 
 CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
 
+logger = logging.getLogger(__name__)
+
 
 @click.group(context_settings=CONTEXT_SETTINGS)
 @click.option('--log-level', '-l', default='INFO',
-              type=click.Choice(logging._nameToLevel.keys()),
+              type=click.Choice(LOG_LEVEL_NAMES),
               help="Log level (default to INFO)")
 @click.pass_context
 def swh(ctx, log_level):
-    """Software Heritage Tool
+    """Command line interface for Software Heritage
     """
+    log_level = logging.getLevelName(log_level)
     logger.setLevel(log_level)
     ctx.ensure_object(dict)
-    ctx.obj['log_level'] = logging._nameToLevel[log_level]
+    ctx.obj['log_level'] = log_level
 
 
 def main():
diff --git a/swh/core/cli/db.py b/swh/core/cli/db.py
--- a/swh/core/cli/db.py
+++ b/swh/core/cli/db.py
@@ -10,11 +10,12 @@
 
 import click
 
+from swh.core.cli import CONTEXT_SETTINGS
 
 logger = logging.getLogger(__name__)
 
 
-@click.command()
+@click.command(context_settings=CONTEXT_SETTINGS)
 @click.argument('module', nargs=-1, required=True)
 @click.option('--db-name', '-d', help='Database name.',
               default='softwareheritage-dev', show_default=True)