diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/jobs/SCJobsUtil.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/jobs/SCJobsUtil.java
index 5df75853d7d..c590146cdae 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/jobs/SCJobsUtil.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/jobs/SCJobsUtil.java
@@ -87,7 +87,7 @@ public class SCJobsUtil {
                     ISafeRunnable runnable = new ISafeRunnable() {
 
                         public void run() {
-                            esiProvider.invokeProvider(monitor, project, providerId, buildInfo, collector);
+                            esiProvider.invokeProvider(monitor, project, context, providerId, buildInfo, collector, null);
                             rc.set(true);
                         }
             
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildConfigurationData.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildConfigurationData.java
index 6618cdccd56..407728de333 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildConfigurationData.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildConfigurationData.java
@@ -31,7 +31,7 @@ import org.eclipse.core.runtime.IPath;
 
 public class BuildConfigurationData extends CConfigurationData {
 	private Configuration fCfg;
-	private BuildVariablesContributor fCdtVars;
+//	private BuildVariablesContributor fCdtVars;
 	public BuildConfigurationData(IConfiguration cfg){
 		fCfg = (Configuration)cfg;
 	}
@@ -127,17 +127,18 @@ public class BuildConfigurationData extends CConfigurationData {
 	}
 
 	public ICdtVariablesContributor getBuildVariablesContributor() {
-		if(fCdtVars == null)
-			fCdtVars = new BuildVariablesContributor(this);
-		return fCdtVars;
+//		if(fCdtVars == null)
+//			fCdtVars = new BuildVariablesContributor(this);
+//		return fCdtVars;
+		return new BuildVariablesContributor(this);
 	}
 	
 	void clearCachedData(){
 		fCfg.clearCachedData();
 		CResourceData[] datas = getResourceDatas();
 		CResourceData data;
-		BuildLanguageData lData;
-		BuildLanguageData[] lDatas;
+//		BuildLanguageData lData;
+//		BuildLanguageData[] lDatas;
 
 		
 		for(int i = 0; i < datas.length; i++){