diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index 33602ccc7487467472ce34013350451c8f61d793..acf0102d65fdef5855d4b79917f2988fa41d81dd 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -435,7 +435,7 @@ void CMakeRunConfigurationWidget::setWorkingDirectory()
     if (m_ignoreChange)
         return;
     m_ignoreChange = true;
-    m_cmakeRunConfiguration->setUserWorkingDirectory(m_workingDirectoryEdit->path());
+    m_cmakeRunConfiguration->setUserWorkingDirectory(m_workingDirectoryEdit->rawPath());
     m_ignoreChange = false;
 }
 
@@ -449,7 +449,7 @@ void CMakeRunConfigurationWidget::resetWorkingDirectory()
 {
     // This emits a signal connected to workingDirectoryChanged()
     // that sets the m_workingDirectoryEdit
-    m_cmakeRunConfiguration->setUserWorkingDirectory("");
+    m_cmakeRunConfiguration->setUserWorkingDirectory(QString());
 }
 
 void CMakeRunConfigurationWidget::useCppDebuggerToggled(bool toggled)
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 0f85ca928fd4e89dc97cd28c50ad99b5c27cfbf5..db8db8c5cf8613e08ee5f81763c958de6a0e6fb9 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -514,7 +514,7 @@ void GenericBuildSettingsWidget::init(BuildConfiguration *bc)
 
 void GenericBuildSettingsWidget::buildDirectoryChanged()
 {
-    m_buildConfiguration->setBuildDirectory(m_pathChooser->path());
+    m_buildConfiguration->setBuildDirectory(m_pathChooser->rawPath());
 }
 
 void GenericBuildSettingsWidget::toolChainSelected(int index)
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index 1ab6c4c0412c3e53bc0afedf4b2658dffbe00148..b5fe3731ea8fad7676de56ca92d098205849320e 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -209,6 +209,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
     m_workingDirectoryEdit->setPath(m_qt4RunConfiguration->workingDirectory());
     m_workingDirectoryEdit->setBaseDirectory(m_qt4RunConfiguration->target()->project()->projectDirectory());
     m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::Directory);
+    m_workingDirectoryEdit->setEnvironment(m_qt4RunConfiguration->environment());
     m_workingDirectoryEdit->setPromptDialogTitle(tr("Select Working Directory"));
 
     QToolButton *resetButton = new QToolButton(this);
@@ -378,7 +379,7 @@ void Qt4RunConfigurationWidget::workDirectoryEdited()
     if (m_ignoreChange)
         return;
     m_ignoreChange = true;
-    m_qt4RunConfiguration->setWorkingDirectory(m_workingDirectoryEdit->path());
+    m_qt4RunConfiguration->setWorkingDirectory(m_workingDirectoryEdit->rawPath());
     m_ignoreChange = false;
 }