--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java	Fri Apr 30 12:41:41 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java	Fri Apr 30 15:55:10 2010 -0500
@@ -289,21 +289,25 @@
 		}
 	}
 	
-	public boolean equals(Object obj) {
-		if (obj instanceof ICarbideBuildConfiguration || obj instanceof ISymbianBuildContext){
-			ISymbianBuildContext context = (ISymbianBuildContext)obj;
-			if (context.getDisplayString().equals(this.getDisplayString())){
-				return true;
-			} else if (context.getPlatformString().equals(this.getPlatformString()) && 
-					context.getTargetString().equals(this.getTargetString()) && 
-					context.getSDK().equals(this.getSDK()) && context.getSBSv2Alias() != null && context.getSBSv2Alias().split("_").length == 2){ 
-				return true; 
-			} else {
-				return false;
-			}
-		}
-		return false;
-	}
+//	public boolean equals(Object obj) {
+//		if (obj instanceof ICarbideBuildConfiguration || obj instanceof ISymbianBuildContext){
+//			ISymbianBuildContext context = (ISymbianBuildContext)obj;
+//			if (context.getDisplayString().equals(this.getDisplayString())){
+//				return true;
+//			} else if (context.getPlatformString().equals(this.getPlatformString()) && 
+//					context.getTargetString().equals(this.getTargetString()) && 
+//					context.getSDK().equals(this.getSDK())){
+//				if (context.getSBSv2Alias() == null && this.getSBSv2Alias() == null)
+//					return true;  // SBSv1 check
+//				else if (context.getSBSv2Alias().equalsIgnoreCase(this.getSBSv2Alias())){
+//					return true;  // SBSv2 check
+//				}
+//			} else {
+//				return false;
+//			}
+//		}
+//		return false;
+//	}
 	
 	public int getErrorParserId(){
 		String plat = this.getPlatformString();

--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java	Fri Apr 30 12:41:41 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java	Fri Apr 30 15:55:10 2010 -0500
@@ -76,7 +76,7 @@
 			return true;
 		if (obj == null)
 			return false;
-		if (getClass() != obj.getClass())
+		if (!(obj instanceof SymbianBuildContext))
 			return false;
 		final SymbianBuildContext other = (SymbianBuildContext) obj;
 		if (platform == null) {