diff --git a/DesktopEditor/common/Directory.cpp b/DesktopEditor/common/Directory.cpp
index 66442dbb01..338a52f75a 100644
--- a/DesktopEditor/common/Directory.cpp
+++ b/DesktopEditor/common/Directory.cpp
@@ -586,11 +586,7 @@ namespace NSDirectory
 	int GetFilesCount(const std::wstring& path, const bool& recursive)
 	{
 		std::vector<std::wstring> arrFiles = NSDirectory::GetFiles(path, recursive);
-#if defined(_WIN32) || defined (_WIN64)
 		return (int)arrFiles.size();
-#endif
-		return (int)arrFiles.size() + 1;
-		// ???
 	}
 	bool PathIsDirectory(const std::wstring& pathName)
 	{
diff --git a/Test/Applications/x2tTester/x2tTester.cpp b/Test/Applications/x2tTester/x2tTester.cpp
index 7ab3959110..2a73a79329 100644
--- a/Test/Applications/x2tTester/x2tTester.cpp
+++ b/Test/Applications/x2tTester/x2tTester.cpp
@@ -465,6 +465,7 @@ void Cx2tTester::Start()
 	m_outputDirectory = CorrectPathW(m_outputDirectory);
 	m_errorsXmlDirectory = CorrectPathW(m_errorsXmlDirectory);
 	m_troughConversionDirectory = CorrectPathW(m_troughConversionDirectory);
+	m_tempDirectory = CorrectPathW(m_tempDirectory);
 
 	// setup & clear output folder
 	if(NSDirectory::Exists(m_outputDirectory))
@@ -534,7 +535,7 @@ void Cx2tTester::Start()
 			if(NSDirectory::Exists(m_tempDirectory))
 				NSDirectory::DeleteDirectory(m_tempDirectory);
 
-			NSDirectory::CreateDirectories(CorrectPathW(m_tempDirectory));
+			NSDirectory::CreateDirectories(m_tempDirectory);
 
 			auto copy_inputDirectory = m_inputDirectory;
 			auto copy_outputDirectory = m_outputDirectory;
@@ -644,7 +645,7 @@ void Cx2tTester::Convert(const std::vector<std::wstring>& files, bool bNoDirecto
 
 		// setup & clear output subfolder
 		if (!NSDirectory::Exists(output_files_directory))
-			NSDirectory::CreateDirectories(CorrectPathW(output_files_directory));
+			NSDirectory::CreateDirectories(output_files_directory);
 
 		std::wstring csvTxtEncodingS = m_defaultCsvTxtEndcoding;
 		std::wstring csvDelimiter = m_defaultCsvDelimiter;