diff --git a/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj b/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj
index d05d054260..dc69b78bc6 100644
--- a/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj
+++ b/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj
@@ -165,6 +165,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
       </PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="..\..\DesktopEditor\raster\exif.cpp" />
     <ClCompile Include="..\..\HtmlRenderer\src\ASCSVGWriter.cpp" />
     <ClCompile Include="..\ASCOfficeDrawingConverter.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
@@ -342,6 +343,7 @@
     <ClInclude Include="..\..\Common\DocxFormat\Source\DocxFormat\WritingVector.h" />
     <ClInclude Include="..\..\Common\DocxFormat\Source\SystemUtility\File.h" />
     <ClInclude Include="..\..\Common\DocxFormat\Source\SystemUtility\SystemUtility.h" />
+    <ClInclude Include="..\..\DesktopEditor\raster\exif.h" />
     <ClInclude Include="..\ASCOfficeDrawingConverter.h" />
     <ClInclude Include="..\ASCOfficePPTXFile.h" />
     <ClInclude Include="..\Editor\BinaryFileReaderWriter.h" />
diff --git a/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj.filters b/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj.filters
index 5aaf4f19de..d4eb772e8f 100644
--- a/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj.filters
+++ b/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj.filters
@@ -272,6 +272,9 @@
     </ClCompile>
     <ClCompile Include="..\ASCOfficeDrawingConverter.cpp" />
     <ClCompile Include="..\ASCOfficePPTXFileRealization.cpp" />
+    <ClCompile Include="..\..\DesktopEditor\raster\exif.cpp">
+      <Filter>BinaryReaderWriter</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Editor\BinaryFileReaderWriter.h">
@@ -1476,5 +1479,8 @@
     </ClInclude>
     <ClInclude Include="..\ASCOfficeDrawingConverter.h" />
     <ClInclude Include="..\ASCOfficePPTXFile.h" />
+    <ClInclude Include="..\..\DesktopEditor\raster\exif.h">
+      <Filter>BinaryReaderWriter</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Fb2File/Fb2File.pro b/Fb2File/Fb2File.pro
index ccae481b44..6cbfe712c1 100644
--- a/Fb2File/Fb2File.pro
+++ b/Fb2File/Fb2File.pro
@@ -12,7 +12,7 @@ CONFIG += core_static_link_libstd
 
 DEFINES += FB2FILE_USE_DYNAMIC_LIBRARY
 
-CORE_ROOT_DIR = $$PWD/../../core
+CORE_ROOT_DIR = $$PWD/..
 PWD_ROOT_DIR = $$PWD
 include($$CORE_ROOT_DIR/Common/base.pri)
 
diff --git a/HtmlFile2/HtmlFile2.pro b/HtmlFile2/HtmlFile2.pro
index f7bb12330e..3b4012cbad 100644
--- a/HtmlFile2/HtmlFile2.pro
+++ b/HtmlFile2/HtmlFile2.pro
@@ -12,7 +12,7 @@ CONFIG += core_static_link_libstd
 DEFINES += HTMLFILE2_USE_DYNAMIC_LIBRARY
 DEFINES += CSSCALCULATOR_LIBRARY_STATIC
 
-CORE_ROOT_DIR = $$PWD/../../core
+CORE_ROOT_DIR = $$PWD/..
 PWD_ROOT_DIR = $$PWD
 include($$CORE_ROOT_DIR/Common/base.pri)
 
diff --git a/X2tConverter/src/cextracttools.cpp b/X2tConverter/src/cextracttools.cpp
index 499fa83663..42833f72be 100644
--- a/X2tConverter/src/cextracttools.cpp
+++ b/X2tConverter/src/cextracttools.cpp
@@ -58,10 +58,9 @@ namespace NExtractTools
 			nSeparator2Pos = sFile2.rfind(_T('\\'));
 		}
 
-
 		// check for directory in name
-		bool bIsFile1Directory = ((std::wstring::npos != nSeparator1Pos) && (nExt1Pos < nSeparator1Pos));   // i.e: /root1/child1.lalala/folder
-		bool bIsFile2Directory = ((std::wstring::npos != nSeparator2Pos) && (nExt2Pos < nSeparator2Pos));
+		bool bIsFile1Directory = (std::wstring::npos != nExt1Pos) ? ((std::wstring::npos != nSeparator1Pos) && (nExt1Pos < nSeparator1Pos)) : (std::wstring::npos != nSeparator1Pos);   // i.e: /root1/child1.lalala/folder
+		bool bIsFile2Directory = (std::wstring::npos != nExt2Pos) ? ((std::wstring::npos != nSeparator2Pos) && (nExt2Pos < nSeparator2Pos)) : (std::wstring::npos != nSeparator2Pos);
 
 		// automatic zip/unzip task detection
 		if (bIsFile1Directory)