diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py
index 427d07fa77..960f229816 100644
--- a/doc/sphinx/conf.py
+++ b/doc/sphinx/conf.py
@@ -77,7 +77,7 @@ messages_doc = 'kea-messages'
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index cc2fd3c57b..5d65fc0e02 100644
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -626,7 +626,7 @@ mysql_upgrade_13_to_14_test() {
         assert_eq 0 "${EXIT_CODE}" "${query}: expected %d, returned %d"
         assert_str_eq '2' "${OUTPUT}" "${query}: expected output %s, returned %s"
 
-        # Artifically change the subnet counter from 2 down to 1.
+        # Artificially change the subnet counter from 2 down to 1.
         query="UPDATE lease${v}_stat SET leases = 1 WHERE subnet_id = 1 AND state = 0"
         run_command \
             mysql_execute "${query}"
@@ -640,7 +640,7 @@ mysql_upgrade_13_to_14_test() {
             assert_eq 0 "${EXIT_CODE}" "${query}: expected %d, returned %d"
             assert_str_eq '2' "${OUTPUT}" "${query}: expected output %s, returned %s"
 
-            # Artifically change the client class counter from 2 down to 1.
+            # Artificially change the client class counter from 2 down to 1.
             query="UPDATE lease${v}_stat_by_client_class SET leases = 1 WHERE client_class = 'foo'"
             run_command \
                 mysql_execute "${query}"
@@ -655,7 +655,7 @@ mysql_upgrade_13_to_14_test() {
         assert_eq 0 "${EXIT_CODE}" "${query}: expected %d, returned %d"
         assert_str_eq '' "${OUTPUT}" "${query}: expected output %s, returned %s"
 
-        # SELECT should finish succesfully and the subnet counter should be 0.
+        # SELECT should finish successfully and the subnet counter should be 0.
         query="SELECT leases FROM lease${v}_stat WHERE subnet_id = 1 AND state = 0 LIMIT 1"
         run_command \
             mysql_execute "${query}"
@@ -663,7 +663,7 @@ mysql_upgrade_13_to_14_test() {
         assert_str_eq '0' "${OUTPUT}" "${query}: expected output %s, returned %s"
 
         if test "${json_supported}" = 1; then
-            # SELECT should finish succesfully and the client class counter should be 0.
+            # SELECT should finish successfully and the client class counter should be 0.
             query="SELECT leases FROM lease${v}_stat_by_client_class WHERE client_class = 'foo' LIMIT 1"
             run_command \
                 mysql_execute "${query}"