diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/IExpressionVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/IExpressionVMNode.java
index aa00c6472ab..7db2fa2e30f 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/IExpressionVMNode.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/expression/IExpressionVMNode.java
@@ -22,7 +22,6 @@ import org.eclipse.jface.viewers.TreePath;
  * to use this node to delegate expression parsing to this node, and to 
  * generate deltas for expressions that are owned by this node.
  */
-@SuppressWarnings("restriction")
 public interface IExpressionVMNode extends IVMNode {
     
     /**
diff --git a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMDelta.java b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMDelta.java
index ac52e8d9834..a6a30d5044f 100644
--- a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMDelta.java
+++ b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMDelta.java
@@ -121,6 +121,7 @@ public class VMDelta extends ModelDelta {
         fFlags = flags;
     }
 
+    @Override
     public void setChildCount(int count) {
         fChildCount = count;
     }
diff --git a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/AutomaticUpdatePolicy.java b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/AutomaticUpdatePolicy.java
index 23e156ecf60..cdc3f800639 100644
--- a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/AutomaticUpdatePolicy.java
+++ b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/AutomaticUpdatePolicy.java
@@ -36,7 +36,7 @@ public class AutomaticUpdatePolicy implements IVMUpdatePolicy {
     }
 
     public String getName() {
-        return "Automatic";
+        return ViewModelUpdateMessages.AutomaticUpdatePolicy_name;
     }
 
     public IElementUpdateTester getElementUpdateTester(Object event) {
diff --git a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/ManualUpdatePolicy.java b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/ManualUpdatePolicy.java
index c290fadec93..014f3314d68 100644
--- a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/ManualUpdatePolicy.java
+++ b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/ManualUpdatePolicy.java
@@ -76,7 +76,7 @@ public class ManualUpdatePolicy implements IVMUpdatePolicy {
     }
 
     public String getName() {
-        return "Manual";
+        return ViewModelUpdateMessages.ManualUpdatePolicy_name;
     }
 
     public IElementUpdateTester getElementUpdateTester(Object event) {
diff --git a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/ViewModelUpdateMessages.java b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/ViewModelUpdateMessages.java
new file mode 100644
index 00000000000..975de1173bd
--- /dev/null
+++ b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/ViewModelUpdateMessages.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Wind River Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.dd.dsf.ui.viewmodel.update;
+
+import org.eclipse.osgi.util.NLS;
+
+public class ViewModelUpdateMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.dd.dsf.ui.viewmodel.update.ViewModelUpdateMessages";//$NON-NLS-1$
+
+    public static String AutomaticUpdatePolicy_name;
+    public static String ManualUpdatePolicy_name;
+	
+    static {
+        // load message values from bundle file
+        NLS.initializeMessages(BUNDLE_NAME, ViewModelUpdateMessages.class);
+    }
+}
diff --git a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/ViewModelUpdateMessages.properties b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/ViewModelUpdateMessages.properties
new file mode 100644
index 00000000000..41dae99e2c6
--- /dev/null
+++ b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/ViewModelUpdateMessages.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2008 Wind River Systems and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#   Wind River Systems - initial API and implementation
+###############################################################################
+AutomaticUpdatePolicy_name = Automatic
+ManualUpdatePolicy_name = Manual
\ No newline at end of file
diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIMemory.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIMemory.java
index c47752e903e..80feb2b52ec 100644
--- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIMemory.java
+++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIMemory.java
@@ -352,7 +352,6 @@ public class MIMemory extends AbstractDsfService implements IMemory {
 		// Insert the block in the sorted linked list and merge contiguous
 		// blocks if necessary
 		@Override
-		@SuppressWarnings("unchecked")
 		public boolean add(MemoryBlock block) {
 
 			// If the list is empty, just store the block