diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
index 4ff77feb2ac..74aaa21df28 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
@@ -157,7 +157,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild
 	//property for holding the resource change state
 	private static final String RC_CHANGE_STATE = "rcState";  //$NON-NLS-1$
 	//resource change state
-	private int resourceChangeState;
+	private int resourceChangeState = -1;
 
 	//Internal Builder state
 	//NOTE: these are temporary properties
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/EnvVarBuildPath.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/EnvVarBuildPath.java
index 94ceeae8103..c08a21866b1 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/EnvVarBuildPath.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/EnvVarBuildPath.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005 Intel Corporation and others.
+ * Copyright (c) 2005, 2007 Intel Corporation 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
@@ -20,7 +20,6 @@ import org.eclipse.core.runtime.IConfigurationElement;
 
 public class EnvVarBuildPath implements
 		IEnvVarBuildPath {
-	private ITool tool;
 	
 	private int type;
 	private String variableNames[];
@@ -36,7 +35,6 @@ public class EnvVarBuildPath implements
 	 * @param element The element containing the information about the tool.
 	 */
 	public EnvVarBuildPath(ITool tool, IManagedConfigElement element) {
-		this.tool = tool;
 		loadFromManifest(element);
 	}
 	
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PropertyManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PropertyManager.java
index 9cbffb2edef..9e3a1faf703 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PropertyManager.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PropertyManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 Intel Corporation and others.
+ * Copyright (c) 2006, 2007 Intel Corporation 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
@@ -25,6 +25,7 @@ import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
 import org.eclipse.cdt.managedbuilder.core.IManagedProject;
 import org.eclipse.cdt.managedbuilder.core.IResourceConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IResourceInfo;
 import org.eclipse.cdt.managedbuilder.core.ITool;
 import org.eclipse.cdt.managedbuilder.core.IToolChain;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
@@ -316,8 +317,8 @@ public class PropertyManager {
 		setProperty(cfg, cfg, key, value);
 	}
 
-	public void setProperty(IResourceConfiguration rcCfg, String key, String value){
-		setProperty(rcCfg.getParent(), rcCfg, key, value);
+	public void setProperty(IResourceInfo rcInfo, String key, String value){
+		setProperty(rcInfo.getParent(), rcInfo, key, value);
 	}
 
 	public void setProperty(IToolChain tc, String key, String value){
@@ -339,8 +340,8 @@ public class PropertyManager {
 		return getProperty(cfg, cfg, key);
 	}
 
-	public String getProperty(IResourceConfiguration rcCfg, String key){
-		return getProperty(rcCfg.getParent(), rcCfg, key);
+	public String getProperty(IResourceInfo rcInfo, String key){
+		return getProperty(rcInfo.getParent(), rcInfo, key);
 	}
 
 	public String getProperty(IToolChain tc, String key){
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceInfo.java
index 23584ed59ff..859873e36eb 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceInfo.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceInfo.java
@@ -11,7 +11,6 @@
 package org.eclipse.cdt.managedbuilder.internal.core;
 
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Set;
 
 import org.eclipse.cdt.core.settings.model.ICStorageElement;