diff --git a/module_prototyper/README.rst b/module_prototyper/README.rst
index 8c80dc740..dad21b91c 100644
--- a/module_prototyper/README.rst
+++ b/module_prototyper/README.rst
@@ -42,8 +42,8 @@ You will get a zip file containing your module ready to be installed and complia
 conventions of the OCA. You can then provide the module to a developer who have to implement 
 things like default values or onchange methods.
 
-Known issues / Roadmap
-======================
+Roadmap
+=======
 
  * `#104`_ - Include controllers.py and templates.xml from scaffold.
  * Attach images to the prototype and export them to be used in the 'images' module manifest.
@@ -52,7 +52,13 @@ Known issues / Roadmap
 
 .. _#104: https://github.com/OCA/server-tools/issues/104
 
-Please report any idea or issue to https://github.com/OCA/server-tools/issues.
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/server-tools/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed feedback
+`here <https://github.com/OCA/server-tools/issues/new?body=module:%20module_prototyper%0Aversion:%200.3%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Credits
 =======
diff --git a/module_prototyper/__openerp__.py b/module_prototyper/__openerp__.py
index 808d9b836..b9672122c 100644
--- a/module_prototyper/__openerp__.py
+++ b/module_prototyper/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Module Prototyper',
     'version': '0.3',
-    'author': 'Savoir-faire Linux',
+    'author': 'Savoir-faire Linux, Odoo Community Association (OCA)',
     'maintainer': 'Savoir-faire Linux',
     'website': 'http://www.savoirfairelinux.com',
     'license': 'AGPL-3',
diff --git a/module_prototyper/models/default_description.py b/module_prototyper/models/default_description.py
index 5263b7cd1..874a066d4 100644
--- a/module_prototyper/models/default_description.py
+++ b/module_prototyper/models/default_description.py
@@ -53,11 +53,19 @@ For further information, please visit:
 
  * https://www.odoo.com/forum/help-1
 
-Known issues / Roadmap
-======================
+Roadmap
+=======
 
  * ...
 
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/{project_repo}/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed feedback
+`here <https://github.com/OCA/{project_repo}/issues/new?body=module:%20{module_name}%0Aversion:%20{version}%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
 Credits
 =======
 
diff --git a/module_prototyper/models/module_prototyper.py b/module_prototyper/models/module_prototyper.py
index 25816ca87..aa2fa0a9e 100644
--- a/module_prototyper/models/module_prototyper.py
+++ b/module_prototyper/models/module_prototyper.py
@@ -61,7 +61,7 @@ class ModulePrototyper(models.Model):
             ('Other proprietary', 'Other Proprietary')
         ],
         string='License',
-        default=licenses.AGPL3_L,
+        default=licenses.AGPL3,
     )
     name = fields.Char(
         'Technical Name', required=True,