diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index c01f648f1e0..c95b1bdcb45 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -84,7 +84,7 @@
                id="org.eclipse.cdt.make.ui.CViewCreateBuildAction">
          </action>
          <filter
-               name="nature"
+               name="projectNature"
                value="org.eclipse.cdt.make.core.makeNature">
          </filter>
       </objectContribution>
@@ -100,7 +100,7 @@
                id="org.eclipse.cdt.make.ui.NavigatorCreateBuildAction">
          </action>
          <filter
-               name="nature"
+               name="projectNature"
                value="org.eclipse.cdt.make.core.makeNature">
          </filter>
       </objectContribution>
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/BuildTargetDialog.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/BuildTargetDialog.java
index d1aea057b88..ea917244c7d 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/BuildTargetDialog.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/BuildTargetDialog.java
@@ -61,7 +61,7 @@ public class BuildTargetDialog extends TitleAreaDialog {
 		super(parentShell);
 		fTargetManager = MakeCorePlugin.getDefault().getTargetManager();
 		String[] id = fTargetManager.getTargetBuilders(container.getProject());
-		if (id != null) {
+		if (id.length > 0) {
 			fBuildInfo = MakeCorePlugin.createBuildInfo(new HashMap(), id[0]);
 		}
 	}
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java
index a5d480de356..3fb66a37098 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java
@@ -23,7 +23,6 @@ import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.part.DrillDownAdapter;
 import org.eclipse.ui.part.ViewPart;
 
@@ -131,7 +130,7 @@ public class MakeView extends ViewPart {
 		drillDownAdapter.addNavigationActions(manager);
 
 		// Other plug-ins can contribute there actions here
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+//		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
 	}
 
 	protected void handleDeleteKeyPressed() {
@@ -148,6 +147,7 @@ public class MakeView extends ViewPart {
 	}
 	
 	void updateActions(IStructuredSelection sel) {
+		addTargetAction.selectionChanged(sel);
 		buildTargetAction.selectionChanged(sel);		
 		deleteTargetAction.selectionChanged(sel);
 		editTargetAction.selectionChanged(sel);