diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/META-INF/MANIFEST.MF b/memory/org.eclipse.cdt.debug.ui.memory.traditional/META-INF/MANIFEST.MF
index 2b755a14f46..afe55dce916 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/META-INF/MANIFEST.MF
+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.debug.core,
  org.eclipse.jface,
  org.eclipse.ui,
  org.eclipse.search;bundle-version="3.4.0"
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.cdt.debug.ui.memory.traditional.TraditionalRenderingPlugin
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/build.properties b/memory/org.eclipse.cdt.debug.ui.memory.traditional/build.properties
index 25ffe193031..3f0236374cd 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/build.properties
+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/build.properties
@@ -15,6 +15,5 @@ bin.includes = META-INF/,\
                plugin.properties,\
                .,\
                plugin.xml,\
-               about.html,\
-               icons/
+               about.html
 src.includes = about.html
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/plugin.xml b/memory/org.eclipse.cdt.debug.ui.memory.traditional/plugin.xml
index adeececc01c..8eb9084eb2c 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/plugin.xml
+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/plugin.xml
@@ -22,7 +22,6 @@
          category="org.eclipse.cdt.debug.ui.CDebugPreferencePage"
          class="org.eclipse.cdt.debug.ui.memory.traditional.TraditionalRenderingPreferencePage"
          id="org.eclipse.cdt.debug.ui.memory.traditional.TraditionalRenderingPreferencePage"
-         helpContextId="TraditionalRenderingPreferencePage_context"
          name="%page.name"/>
 </extension>
 <extension
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java
index f397b1135e5..8b78eca15af 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java
@@ -1192,7 +1192,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
     /* (non-Javadoc)
      * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class)
      */
-    @SuppressWarnings({ "unchecked" })
+	@SuppressWarnings("rawtypes")
 	public Object getAdapter(Class adapter)
     {
         if(adapter == IWorkbenchAdapter.class)