diff --git a/archimesh/__init__.py b/archimesh/__init__.py
index 75784c431142d2be610d0edd12fce406703d06e3..2104760f87a58e401383d584b08255177700fa4f 100644
--- a/archimesh/__init__.py
+++ b/archimesh/__init__.py
@@ -31,10 +31,10 @@ bl_info = {
     "location": "View3D > Add > Mesh > Archimesh",
     "version": (1, 1, 2),
     "blender": (2, 6, 8),
-    "description": "Generate rooms, doors, windows, kitchen cabinets, "
-                   "shelves, roofs, stairs and other architecture stuff.",
-    "tracker_url": "https://developer.blender.org/maniphest/task/edit/form/2/",
-    "category": "Add Mesh"}
+    "description": "Generate rooms, doors, windows, and other architecture objects",
+    "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/Add_Mesh/Archimesh",
+    "category": "Add Mesh"
+    }
 
 import sys
 import os
diff --git a/materials_utils/__init__.py b/materials_utils/__init__.py
index 990dbf03a8644db72957253543457f82cc0f6077..fed5949053cef0ed2c13845972567d4bc7dcdc93 100644
--- a/materials_utils/__init__.py
+++ b/materials_utils/__init__.py
@@ -31,10 +31,10 @@ bl_info = {
     "location": "Materials Properties Specials/Shift Q",
     "description": "Materials Utils & Convertors",
     "warning": "",
-    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6"
-    "/Py/Scripts",
+    "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/3D_interaction/Materials_Utils",
     "tracker_url": "",
-    "category": "Material"}
+    "category": "Material"
+    }
 
 if "bpy" in locals():
     import importlib
diff --git a/measureit/__init__.py b/measureit/__init__.py
index 8e7841fb1f9bf5a6cd09ec701e67174732884dc4..6513dfcf89fd8748688f3182d7044e82899a3e2a 100644
--- a/measureit/__init__.py
+++ b/measureit/__init__.py
@@ -33,8 +33,9 @@ bl_info = {
     "blender": (2, 7, 4),
     "description": "Tools for measuring objects.",
     'warning': 'Temporary: pending review fixes T48704',
-    "tracker_url": "https://developer.blender.org/maniphest/task/edit/form/2/",
-    "category": "3D View"}
+    "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/3D_interaction/Measureit",
+    "category": "3D View"
+    }
 
 import sys
 import os
diff --git a/mesh_carver.py b/mesh_carver.py
index ae6f3ecffe34d9ad5f996723ca352f7881f1f8a8..cc27357280622d20eace08a84532a59e9f932231 100644
--- a/mesh_carver.py
+++ b/mesh_carver.py
@@ -27,7 +27,7 @@ bl_info = {
                 "Scripts/Modeling/Carver",
     "tracker_url": "https://developer.blender.org/maniphest/task/edit/form/2/",
     "description": "Multiple tools to carve or to create objects.",
-}
+    }
 
 import bpy
 import bgl
diff --git a/mesh_tiny_cad/__init__.py b/mesh_tiny_cad/__init__.py
index 4c8e710060a026a460310543a6dc781130a20cc8..4c2c2acdcc470fc8b724c180847cb89b5d103a31 100644
--- a/mesh_tiny_cad/__init__.py
+++ b/mesh_tiny_cad/__init__.py
@@ -28,7 +28,7 @@ bl_info = {
     "location": "View3D > EditMode > (w) Specials",
     "wiki_url": "http://zeffii.github.io/mesh_tiny_cad/",
     "tracker_url": "https://github.com/zeffii/mesh_tiny_cad/issues"
-}
+    }
 
 
 if "bpy" in locals():
diff --git a/object_boolean_tools.py b/object_boolean_tools.py
index 3996f11c3f7e5b43fb0831478101efc272f00501..50e428b6b6ad4997a9f6653797b1f3e0fa486c4a 100644
--- a/object_boolean_tools.py
+++ b/object_boolean_tools.py
@@ -27,7 +27,8 @@ bl_info = {
     "description": "Bool Tools Hotkey: Ctrl Shift B",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/Object/BoolTool",
     "tracker_url": "https://developer.blender.org/maniphest/task/edit/form/2/",
-    "category": "Object"}
+    "category": "Object"
+    }
 
 import bpy
 from bpy.app.handlers import persistent
diff --git a/oscurart_tools/__init__.py b/oscurart_tools/__init__.py
index ba217ac5e681b749901c2154172aebc190017fef..a89b8c928a6572458bbff2d72c750b012b9b8425 100644
--- a/oscurart_tools/__init__.py
+++ b/oscurart_tools/__init__.py
@@ -28,7 +28,6 @@ bl_info = {
     "warning": "",
     "wiki_url":
         "http://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/3D_interaction/Oscurart_Tools",
-    "tracker_url": "https://developer.blender.org/maniphest/task/edit/form/2/",
     "category": "Object",
     }
 
diff --git a/pie_menus_official/__init__.py b/pie_menus_official/__init__.py
index 44e7e531841cca66efa01d6facd6dee172fab2f0..ce84dea452349a908b51b1b84c8094391415be86 100644
--- a/pie_menus_official/__init__.py
+++ b/pie_menus_official/__init__.py
@@ -35,7 +35,7 @@ bl_info = {
     'location': 'See preferences for Activation list',
     'description': 'Pie Menu Activate',
     'warning': '',
-    'wiki_url': '',
+    'wiki_url': 'https://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/3D_interaction/Pie_Menu',
     'category': 'Pie Menu'
     }
 
diff --git a/space_view3d_modifier_tools.py b/space_view3d_modifier_tools.py
index 3615a02b78fb5c5e30c9c13feb5fb27134f66777..e34963bd60d4af893fddfdaa7d8e4875e2a1099b 100644
--- a/space_view3d_modifier_tools.py
+++ b/space_view3d_modifier_tools.py
@@ -28,7 +28,8 @@ bl_info = {
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6"
     "/Py/Scripts/3D_interaction/modifier_tools",
     "tracker_url": "https://developer.blender.org/maniphest/task/edit/form/2/",
-    "category": "3D View"}
+    "category": "3D View"
+    }
 
 import bpy
 from bpy.types import Operator