diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index b7f935dabf4..6ebccc56a3c 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1201,8 +1201,12 @@ StringList getFeatureLibraries(const FeatureList &features) {
 	StringList libraries;
 
 	for (FeatureList::const_iterator i = features.begin(); i != features.end(); ++i) {
-		libraries.merge(getFeatureLibraries(*i));
+		StringList fl = getFeatureLibraries(*i);
+		for (StringList::const_iterator flit = fl.begin(); flit != fl.end(); ++flit) {
+			libraries.push_back(*flit);
+		}
 	}
+	libraries.sort();
 
 	return libraries;
 }
@@ -1227,7 +1231,8 @@ bool getFeatureBuildState(const std::string &name, FeatureList &features) {
 }
 
 BuildSetup removeFeatureFromSetup(BuildSetup setup, const std::string &feature) {
-	for (FeatureList::const_iterator i = setup.features.begin(); i != setup.features.end(); ++i) {
+	// TODO: use const_iterator in C++11
+	for (FeatureList::iterator i = setup.features.begin(); i != setup.features.end(); ++i) {
 		if (i->enable && feature == i->name) {
 			StringList feature_libs = getFeatureLibraries(*i);
 			for (StringList::iterator lib = feature_libs.begin(); lib != feature_libs.end(); ++lib) {
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index fd9c3eab525..80ac6d44b83 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -40,11 +40,18 @@ MSVCProvider::MSVCProvider(StringList &global_warnings, std::map<std::string, St
 	_disableEditAndContinue   = tokenize(DISABLE_EDIT_AND_CONTINUE, ',');
 
 	// NASM not supported for Windows on AMD64 target
-	_arch_disabled_features[ARCH_AMD64] = {"nasm"};
+	StringList amd64_disabled_features;
+	amd64_disabled_features.push_back("nasm");
+	_arch_disabled_features[ARCH_AMD64] = amd64_disabled_features;
 	// NASM not supported for WoA target
 	// No OpenGL, OpenGL ES on Windows on ARM
 	// https://github.com/microsoft/vcpkg/issues/11248 [fribidi] Fribidi doesn't cross-compile on x86-64 to target arm/arm64
-	_arch_disabled_features[ARCH_ARM64] = {"nasm", "opengl", "opengles", "fribidi"};
+	StringList arm64_disabled_features;
+	arm64_disabled_features.push_back("nasm");
+	arm64_disabled_features.push_back("opengl");
+	arm64_disabled_features.push_back("opengles");
+	arm64_disabled_features.push_back("fribidi");
+	_arch_disabled_features[ARCH_ARM64] = arm64_disabled_features;
 }
 
 void MSVCProvider::createWorkspace(const BuildSetup &setup) {