diff --git a/components/esb-tools/plugins/org.wso2.integrationstudio.gmf.esb.diagram/src/org/wso2/integrationstudio/gmf/esb/diagram/part/EsbMultiPageEditor.java b/components/esb-tools/plugins/org.wso2.integrationstudio.gmf.esb.diagram/src/org/wso2/integrationstudio/gmf/esb/diagram/part/EsbMultiPageEditor.java
index e8436a1a1..aa62e1026 100644
--- a/components/esb-tools/plugins/org.wso2.integrationstudio.gmf.esb.diagram/src/org/wso2/integrationstudio/gmf/esb/diagram/part/EsbMultiPageEditor.java
+++ b/components/esb-tools/plugins/org.wso2.integrationstudio.gmf.esb.diagram/src/org/wso2/integrationstudio/gmf/esb/diagram/part/EsbMultiPageEditor.java
@@ -939,7 +939,7 @@ private void handleDesignViewActivatedEvent(boolean withSynapse) throws Exceptio
 
         if (sourceEditor != null) {
             String xmlSource = sourceEditor.getDocument().get();
-            if (xmlSource != null && sourceDirty) {
+            if (xmlSource != null) {
                 if (!xmlSource.trim().isEmpty()) {
                     rebuildModelObject(xmlSource, withSynapse);
                 }
diff --git a/components/studio-platform/plugins/org.wso2.integrationstudio.distribution.project/src/org/wso2/integrationstudio/distribution/project/ui/wizard/DistributionProjectWizard.java b/components/studio-platform/plugins/org.wso2.integrationstudio.distribution.project/src/org/wso2/integrationstudio/distribution/project/ui/wizard/DistributionProjectWizard.java
index c0dd7cba8..bab83894f 100644
--- a/components/studio-platform/plugins/org.wso2.integrationstudio.distribution.project/src/org/wso2/integrationstudio/distribution/project/ui/wizard/DistributionProjectWizard.java
+++ b/components/studio-platform/plugins/org.wso2.integrationstudio.distribution.project/src/org/wso2/integrationstudio/distribution/project/ui/wizard/DistributionProjectWizard.java
@@ -89,14 +89,6 @@ public boolean performFinish() {
 			mavenProject.getModel().setPackaging("carbon/application");
 			Plugin plugin = MavenUtils.createPluginEntry(mavenProject,
 					"org.wso2.maven", "maven-car-plugin", MavenConstants.MAVEN_CAR_VERSION, true);
-			PluginExecution pluginExecution;
-			
-
-			pluginExecution = new PluginExecution();
-			pluginExecution.addGoal("car");
-			pluginExecution.setPhase("package");
-			pluginExecution.setId("car");
-			plugin.addExecution(pluginExecution);
 			
 			Plugin carDeployPlugin = MavenUtils.createPluginEntry(mavenProject, "org.wso2.maven", "maven-car-deploy-plugin", MavenConstants.MAVEN_CAR_DEPLOY_VERSION, true);
 			Xpp3Dom carDeployConfElement = MavenUtils.createMainConfigurationNode(carDeployPlugin);