diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 0415d32ed..34d38ba1a 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -6,12 +6,14 @@
         {
             "label": "build",
             "type": "shell",
-            "command": "LANG=C make"
+            "command": "LANG=C make",
+            "problemMatcher": []
         },
         {
             "label": "test",
-            "type":"shell",
-            "command": "LANG=C make test"
+            "type": "shell",
+            "command": "LANG=C make test",
+            "problemMatcher": []
         }
     ]
 }
\ No newline at end of file
diff --git a/COPYING b/COPYING
index 273218520..6e1114d81 100644
--- a/COPYING
+++ b/COPYING
@@ -12,6 +12,7 @@ Copyright: 2005-2018, Xavier Guimard <x.guimard@free.fr>
  2012-2015, François-Xavier Deltombe <fxdeltombe@gmail.com>
  2012-2015, David Coutadeur <david.coutadeur@gmail.com>
  2018, Christophe Maudoux <chrmdx@gmail.com>
+ 2005-2018, Gendarmerie nationale <https://www.gendarmerie.interieur.gouv.fr>
  2006-2015, LINAGORA <info@linagora.com>
  2015-2018, Savoir-faire Linux <contact@savoirfairelinux.com>
 License: GPL-2+
diff --git a/TODO-2.0.md b/TODO-2.0.md
index cc8c01438..28426b5a3 100644
--- a/TODO-2.0.md
+++ b/TODO-2.0.md
@@ -11,11 +11,8 @@
 * Real federation
 * Unify SAML/OIDC presentation in Choice
 * Read-only manager
-* Register to do
 * Brute-force detection ?
 
 * Verify securedCookie=3 (strange)
 * Calendar in notifications explorer
-* "mail" in UserDB/\*
-* verify activeTimer on/off on screen
-* Add test for #173
+* "mail" in UserDB/\*
\ No newline at end of file
diff --git a/debian/copyright b/debian/copyright
index 404185e05..6ddaa4fa8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: lemonldap-ng
-Upstream-Contact: Xavier Guimard <x.guimard@free.fr>
+Upstream-Contact: https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/issues
 Source: https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/tags?sort=updated_desc
 
 Files: *
@@ -12,6 +12,7 @@ Copyright: 2005-2018, Xavier Guimard <x.guimard@free.fr>
  2012-2015, François-Xavier Deltombe <fxdeltombe@gmail.com>
  2012-2015, David Coutadeur <david.coutadeur@gmail.com>
  2018, Christophe Maudoux <chrmdx@gmail.com>
+ 2005-2018, Gendarmerie nationale <https://www.gendarmerie.interieur.gouv.fr>
  2006-2015, LINAGORA <info@linagora.com>
  2015-2018, Savoir-faire Linux <contact@savoirfairelinux.com>
 License: GPL-2+