diff --git a/plugins/org.eclipse.wst.server.core/plugin.xml b/plugins/org.eclipse.wst.server.core/plugin.xml
index 2a8b426..11e2dc3 100644
--- a/plugins/org.eclipse.wst.server.core/plugin.xml
+++ b/plugins/org.eclipse.wst.server.core/plugin.xml
@@ -8,9 +8,9 @@
   class="org.eclipse.wst.server.core.internal.ServerPlugin">
 
   <requires>
-    <import plugin="org.eclipse.core.runtime"/>
-    <import plugin="org.eclipse.core.resources"/>
-    <import plugin="org.eclipse.debug.core"/>
+    <import plugin="org.eclipse.core.runtime" version="3.0.0" match="equivalent"/>
+    <import plugin="org.eclipse.core.resources" version="3.0.0" match="equivalent"/>
+    <import plugin="org.eclipse.debug.core" version="3.0.0" match="equivalent"/>
   </requires>
 
   <runtime>
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Base.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Base.java
index 976dd76..a5fbed4 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Base.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Base.java
@@ -160,6 +160,7 @@
 	protected void saveMap(IMemento memento, String key, Map map) {
 		IMemento child = memento.createChild("map");
 		child.putString("key", key);
+		int i = 1;
 		Iterator iterator = map.keySet().iterator();
 		while (iterator.hasNext()) {
 			String s = (String) iterator.next();
diff --git a/plugins/org.eclipse.wst.server.ui/plugin.xml b/plugins/org.eclipse.wst.server.ui/plugin.xml
index 58fd8b4..09993e5 100644
--- a/plugins/org.eclipse.wst.server.ui/plugin.xml
+++ b/plugins/org.eclipse.wst.server.ui/plugin.xml
@@ -8,17 +8,17 @@
   class="org.eclipse.wst.server.ui.internal.ServerUIPlugin">
 
 <requires>
-  <import plugin="org.eclipse.core.runtime"/>
-  <import plugin="org.eclipse.core.resources"/>
-  <import plugin="org.eclipse.ui"/>
-  <import plugin="org.eclipse.ui.ide"/>
-  <import plugin="org.eclipse.ui.views"/>
-  <import plugin="org.eclipse.ui.editors"/>
-  <import plugin="org.eclipse.ui.forms"/>
-  <import plugin="org.eclipse.ui.workbench.texteditor"/>
-  <import plugin="org.eclipse.debug.core"/>
-  <import plugin="org.eclipse.debug.ui"/>
-  <import plugin="org.eclipse.wst.server.core"/>
+  <import plugin="org.eclipse.core.runtime" version="3.0.0" match="equivalent"/>
+  <import plugin="org.eclipse.core.resources" version="3.0.0" match="equivalent"/>
+  <import plugin="org.eclipse.ui" version="3.0.0" match="equivalent"/>
+  <import plugin="org.eclipse.ui.ide" version="3.0.0" match="equivalent"/>
+  <import plugin="org.eclipse.ui.views" version="3.0.0" match="equivalent"/>
+  <import plugin="org.eclipse.ui.editors" version="3.0.0" match="equivalent"/>
+  <import plugin="org.eclipse.ui.forms" version="3.0.0" match="equivalent"/>
+  <import plugin="org.eclipse.ui.workbench.texteditor" version="3.0.0" match="equivalent"/>
+  <import plugin="org.eclipse.debug.core" version="3.0.0" match="equivalent"/>
+  <import plugin="org.eclipse.debug.ui" version="3.0.0" match="equivalent"/>
+  <import plugin="org.eclipse.wst.server.core" version="3.0.0" match="equivalent"/>
 </requires>
 
 <runtime>