diff --git a/product/plugins/com.jboss.jbds.central.discovery/plugin.xml b/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
index e52dfe1..521a349 100644
--- a/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
+++ b/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
@@ -56,15 +56,14 @@ Tested by Red Hat.</description>
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.a.web"
             groupId="org.jboss.tools.central.discovery.a.web.extras"
-            certificationId="com.jboss.jbds.discovery.certification.tested"
             description="Android Development Tools, DDMS, Hierarchy Viewer, OpenGL Tracer, Traceview"
             id="com.android.ide.eclipse.adt"
             kind="task"
-            license="EPL, Other"
+            license="Free, EPL, Other"
             name="Android Development Tools"
             provider="Google, Inc."
-            siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
-            <!-- https://issues.jboss.org/browse/JBIDE-12498 -->
+            siteUrl="https://dl-ssl.google.com/android/eclipse/">
+            <!-- https://issues.jboss.org/browse/JBIDE-12498, JBIDE-13167 -->
             <iu id="com.android.ide.eclipse.adt"/>
             <iu id="com.android.ide.eclipse.ddms"/>
             <iu id="com.android.ide.eclipse.hierarchyviewer"/>
@@ -85,7 +84,7 @@ Tested by Red Hat.</description>
             description="Google Web Toolkit Designer + WindowBuilder"
             id="com.google.gdt.eclipse.designer.editor.feature"
             kind="task"
-            license="EPL, Other"
+            license="Free, EPL, Other"
             name="Google Web Toolkit Designer"
             provider="Google, Inc."
             siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
@@ -111,7 +110,7 @@ Tested by Red Hat.</description>
             description="Google Plugin for Eclipse (GPE) + Google Web Toolkit SDK (GWT)"
             id="com.google.gpe.gwt"
             kind="task"
-            license="EPL, Other"
+            license="Free, EPL, Other"
             name="Google Plugin + Web Toolkit"
             provider="Google, Inc."
             siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
@@ -169,7 +168,7 @@ Tested by Red Hat.</description>
             description="Atlassian Connector for Eclipse"
             id="com.atlassian.connector.eclipse"
             kind="task"
-            license="EPL, Other"
+            license="Free, EPL, Other"
             name="Atlassian Connector"
             provider="Atlassian"
             siteUrl="https://devstudio.jboss.com/updates/6.0-staging/central/core/">
@@ -424,7 +423,6 @@ Tested by Red Hat.</description>
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.c.testing"
             groupId="org.jboss.tools.central.discovery.c.testing.remote"
-            certificationId="com.jboss.jbds.discovery.certification.tested"
             description="Tool support for JRebel - requires JST Server"
             id="org.zeroturnaround.eclipse.feature"
             kind="task"