diff --git a/builds/win32/msvc7/intl.vcproj b/builds/win32/msvc7/intl.vcproj
index 49b4624bd9..c27a2c18b7 100644
--- a/builds/win32/msvc7/intl.vcproj
+++ b/builds/win32/msvc7/intl.vcproj
@@ -244,9 +244,6 @@
 			<File
 				RelativePath="..\..\..\src\intl\ld.cpp">
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\unicode_util.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header files"
@@ -680,6 +677,9 @@
 			<File
 				RelativePath="..\..\..\src\jrd\IntlUtil.cpp">
 			</File>
+			<File
+				RelativePath="..\..\..\src\jrd\unicode_util.cpp">
+			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\os\win32\mod_loader.cpp">
 			</File>
diff --git a/builds/win32/msvc8/intl.vcproj b/builds/win32/msvc8/intl.vcproj
index 430ca3e895..37d154018b 100644
--- a/builds/win32/msvc8/intl.vcproj
+++ b/builds/win32/msvc8/intl.vcproj
@@ -459,10 +459,6 @@
 				RelativePath="..\..\..\src\intl\ld.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\jrd\unicode_util.cpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header files"
@@ -1052,6 +1048,10 @@
 				RelativePath="..\..\..\src\jrd\IntlUtil.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\jrd\unicode_util.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\os\win32\mod_loader.cpp"
 				>
diff --git a/src/jrd/IntlManager.cpp b/src/jrd/IntlManager.cpp
index 0129117d99..588b10e313 100644
--- a/src/jrd/IntlManager.cpp
+++ b/src/jrd/IntlManager.cpp
@@ -366,7 +366,7 @@ Firebird::string IntlManager::getConfigInfo(const ConfObj& confObj)
 			values.append(el->getAttributeName(i));
 		}
 
-		if (!configInfo.isEmpty())
+		if (configInfo.hasData())
 			configInfo.append(";");
 		configInfo.append(string(el->name) + "=" + values);
 	}
diff --git a/src/jrd/unicode_util.cpp b/src/jrd/unicode_util.cpp
index 1d3c8cea7d..7769259b1f 100644
--- a/src/jrd/unicode_util.cpp
+++ b/src/jrd/unicode_util.cpp
@@ -1110,15 +1110,15 @@ UnicodeUtil::ICU* UnicodeUtil::Utf16Collation::loadICU(
 
 		if (locale.hasData())
 		{
-			int i = icu->ulocCountAvailable();
+			int avail = icu->ulocCountAvailable();
 
-			while (--i >= 0)
+			while (--avail >= 0)
 			{
-				if (locale == icu->ulocGetAvailable(i))
+				if (locale == icu->ulocGetAvailable(avail))
 					break;
 			}
 
-			if (i < 0)
+			if (avail < 0)
 				continue;
 		}