diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp
index 0dba46d287..7604baec5b 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp
@@ -453,7 +453,7 @@ void anyString::ReadComplexData(XLS::CFRecord& record)
 #endif
 	if (!string_.empty())
 	{
-		int i, length = min(op, string_.length());
+        int i, length = (std::min)(op, (_INT32)string_.length());
 
 		for (i = 0; i < length; i++)
 		{
diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h
index f7c15b5dd6..e3f76f1d75 100644
--- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h
+++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h
@@ -9,7 +9,7 @@
 #include "MSO_enums.h"
 #include <Logic/Biff_structures/HyperlinkObject.h>
 
-#include "../../../ascofficepptxfile/editor/drawing/shapes/baseshape/pptshape/enums.h"
+#include "../../../ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Enums.h"
 
 namespace XLS
 {