diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java
index cc09313cf94..68193f72591 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java
@@ -292,7 +292,7 @@ public class MakeTarget extends PlatformObject implements IMakeTarget {
 		info.setBuildAttribute(IMakeBuilderInfo.BUILD_TARGET_INCREMENTAL, getBuildAttribute(IMakeTarget.BUILD_TARGET, "")); //$NON-NLS-1$
 		info.setEnvironment(getExpandedEnvironment());
 		info.setAppendEnvironment(appendEnvironment());
-		if (container != null) {
+		if (container != null && container != project) {
 			info.setBuildAttribute(IMakeCommonBuildInfo.BUILD_LOCATION, container.getFullPath().toString());
 		}
 		IMakeBuilderInfo projectInfo = MakeCorePlugin.createBuildInfo(getProject(), builderID);
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties
index 3013f1b2215..767fc86c170 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/messages.properties
@@ -10,20 +10,20 @@
 #	  IBM Corporation
 ###############################################################################
 BuilderSettingsTab.0=Builder
-BuilderSettingsTab.1=Builder type
+BuilderSettingsTab.1=Builder &type:
 BuilderSettingsTab.2=External builder
 BuilderSettingsTab.3=Internal builder
-BuilderSettingsTab.4=Use default build command
-BuilderSettingsTab.5=Build command: 
+BuilderSettingsTab.4=&Use default build command
+BuilderSettingsTab.5=Build &command: 
 BuilderSettingsTab.6=Makefile generation
-BuilderSettingsTab.7=Generate Makefiles automatically
-BuilderSettingsTab.8=Expand Env. Variable Refs in Makefiles
+BuilderSettingsTab.7=&Generate Makefiles automatically
+BuilderSettingsTab.8=&Expand Env. Variable Refs in Makefiles
 BuilderSettingsTab.9=Build settings
 BuilderSettingsTab.10=Stop on first build error
 BuilderSettingsTab.11=Use parallel build
 BuilderSettingsTab.12=Use optimal jobs number
 BuilderSettingsTab.13=Use parallel jobs: 
-BuilderSettingsTab.14=Workbench Build Behaviour
+BuilderSettingsTab.14=Workbench Build Behavior
 BuilderSettingsTab.15=Workbench build type:
 BuilderSettingsTab.16=Make build target:
 BuilderSettingsTab.17=Build on resource save (Auto build)
@@ -31,7 +31,7 @@ BuilderSettingsTab.18=Note: See Workbench automatic build preference
 BuilderSettingsTab.19=Build (Incremental build)
 BuilderSettingsTab.20=Clean
 BuilderSettingsTab.21=Build location
-BuilderSettingsTab.22=Build directory
+BuilderSettingsTab.22=Build &directory:
 BuildStepsTab.0=Command:
 BuildStepsTab.1=Description:
 BuildStepsTab.2=Pre-build steps