diff --git a/config-templates/config.php b/config-templates/config.php
index 0bf9def7cd6bd5acb1b0e2835851e6694ad91e64..6a531e15951094e1e30c8e6773fb90f58fe66d7c 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -544,7 +544,7 @@ $config = [
      * Example:
      *  'session.cookie.domain' => '.example.org',
      */
-    'session.cookie.domain' => null,
+    'session.cookie.domain' => '',
 
     /*
      * Set the secure flag in the cookie.
@@ -788,7 +788,7 @@ $config = [
      * Options to override the default settings for the language cookie
      */
     'language.cookie.name' => 'language',
-    'language.cookie.domain' => null,
+    'language.cookie.domain' => '',
     'language.cookie.path' => '/',
     'language.cookie.secure' => true,
     'language.cookie.httponly' => false,
diff --git a/package-lock.json b/package-lock.json
index 06bdb17ecb33f7c63115721f3b9c1212ec0f669e..75e50e872dd9b61e6be1d372e43fadb406baac83 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "simplesamlphp",
       "license": "MIT",
       "dependencies": {
         "@fortawesome/fontawesome-free": "^5.15.2",