--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Wed Sep 15 18:24:56 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Thu Sep 16 00:04:43 2010 -0500
@@ -378,6 +378,8 @@
 	public static void setStopModeMainTab(ILaunchConfigurationWorkingCopy configuration, IProject project) {
 		//===== StopMode :  main tab =================================================== 
 		//		
+		configuration.setAttribute(RemoteConnectionsTRKHelper.CONNECTION_ATTRIBUTE, Registry.CURRENT_CONNECTION_ID);
+
 		if (project != null) {
 			String projectName = project.getName();
 			configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, projectName);
@@ -657,7 +659,7 @@
 			configuration.setMappedResources( new IResource[] { project });
 		    ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(project);
 		    configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, 
-		    		cpi != null ? cpi.getDefaultBuildConfigName() : ""); //$NON-NLS-1$
+		    		cpi != null ? cpi.getDefaultConfiguration().getBuildContext().getConfigurationID() : ""); //$NON-NLS-1$
 		}
 		
 		// set rom log file defaults.  do this for all launch types since it shouldn't hurt