diff --git a/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h b/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h
index aa8f7d1f..5dc99b27 100644
--- a/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h
+++ b/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h
@@ -38,9 +38,13 @@ typedef vector<string> stringVector;
 
 static string changeExt(string fn, string ext)
 {
+	if (ext == "")
+		return fn;
+
 	string fnExt = fn;
+	
 	int index = fnExt.find_last_of(".");
-	string extension = ext == ""?"":".";
+	string extension = ".";
 	extension += ext;
 	if (index == string::npos)
 	{
diff --git a/PowerEditor/src/langs.xml b/PowerEditor/src/langs.xml
index 278260d9..73681458 100644
--- a/PowerEditor/src/langs.xml
+++ b/PowerEditor/src/langs.xml
@@ -11,7 +11,7 @@
 
         <Language name="cpp" ext="h hpp hxx cpp cxx cc" commentLine="//" commentStart="/*" commentEnd="*/">
             <Keywords name="instre1">if else switch case default break goto return for while do continue typedef sizeof NULL new delete throw try catch namespace operator this const_cast static_cast dynamic_cast reinterpret_cast true false using typeid and and_eq bitand bitor compl not not_eq or or_eq xor xor_eq </Keywords>
-            <Keywords name="type1">void struct union enum char short int long double float signed unsigned const static extern auto register volatile bool class private protected public friend inline template virtual asm explicit typename</Keywords>
+            <Keywords name="type1">void struct union enum char short int long double float signed unsigned const static extern auto register volatile bool class private protected public friend inline template virtual asm explicit typename mutable</Keywords>
             <Keywords name="type2">a addindex addtogroup anchor arg attention author b brief bug c class code date def defgroup deprecated dontinclude e em endcode endhtmlonly endif endlatexonly endlink endverbatim enum example exception f$ f[ f] file fn hideinitializer htmlinclude htmlonly if image include ingroup internal invariant interface latexonly li line link mainpage name namespace nosubgrouping note overload p page par param post preref relates remarks return retval sa section see showinitializer since skip skipline struct subsection test throw throws todo typedef union until var verbatim verbinclude version warning weakgroup $ @ \ &amp; &lt; &gt; # { }</Keywords>
         </Language>