diff --git a/cMake/UseLibPack10x.cmake b/cMake/UseLibPack10x.cmake
index 2e6aed4f7..8e786f46f 100644
--- a/cMake/UseLibPack10x.cmake
+++ b/cMake/UseLibPack10x.cmake
@@ -32,7 +32,7 @@ set(Boost_LIBRARIES
     optimized boost_program_options-vc110-mt-1_55.lib
     optimized boost_regex-vc110-mt-1_55.lib
     optimized boost_signals-vc110-mt-1_55.lib
-    optimized boost_thread-vc110-mt-1_55.lib
+    #optimized boost_thread-vc110-mt-1_55.lib
 )
 set(Boost_DEBUG_LIBRARIES 
     debug boost_filesystem-vc110-mt-gd-1_55.lib
@@ -41,12 +41,12 @@ set(Boost_DEBUG_LIBRARIES
     debug boost_program_options-vc110-mt-gd-1_55.lib
     debug boost_regex-vc110-mt-gd-1_55.lib
     debug boost_signals-vc110-mt-gd-1_55.lib
-    debug boost_thread-vc110-mt-gd-1_55.lib
+    #debug boost_thread-vc110-mt-gd-1_55.lib
 )
 set(Boost_FOUND TRUE) 
 
 # Zlib
-set(ZLIB_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/zlib-1.2.3)
+set(ZLIB_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/zlib-1.2.7)
 set(ZLIB_LIBRARIES  zlib.lib)
 set(ZLIB_FOUND TRUE) 
 
diff --git a/src/Base/Parameter.cpp b/src/Base/Parameter.cpp
index 24eacefec..21ddc1fc9 100644
--- a/src/Base/Parameter.cpp
+++ b/src/Base/Parameter.cpp
@@ -451,9 +451,9 @@ std::vector<std::pair<std::string,bool> > ParameterGrp::GetBoolMap(const char *
         // check on filter condition
         if (sFilter == NULL || Name.find(sFilter)!= std::string::npos) {
             if (strcmp(StrX(((DOMElement*)pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str(),"1"))
-                vrValues.push_back(std::make_pair<std::string, bool>(Name, false));
+                vrValues.push_back(std::make_pair(Name, false));
             else
-                vrValues.push_back(std::make_pair<std::string, bool>(Name, true));
+                vrValues.push_back(std::make_pair(Name, true));
         }
         pcTemp = FindNextElement(pcTemp,"FCBool");
     }
@@ -513,7 +513,7 @@ std::vector<std::pair<std::string,long> > ParameterGrp::GetIntMap(const char * s
         Name = StrX( ((DOMElement*)pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str();
         // check on filter condition
         if (sFilter == NULL || Name.find(sFilter)!= std::string::npos) {
-            vrValues.push_back(std::make_pair<std::string, long>(Name,
+            vrValues.push_back(std::make_pair(Name,
                                ( atol (StrX(((DOMElement*)pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str()))));
         }
         pcTemp = FindNextElement(pcTemp,"FCInt") ;
@@ -574,7 +574,7 @@ std::vector<std::pair<std::string,unsigned long> > ParameterGrp::GetUnsignedMap(
         Name = StrX( ((DOMElement*)pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str();
         // check on filter condition
         if (sFilter == NULL || Name.find(sFilter)!= std::string::npos) {
-            vrValues.push_back(std::make_pair<std::string, unsigned long>(Name,
+            vrValues.push_back(std::make_pair(Name,
                                ( strtoul (StrX(((DOMElement*)pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str(),0,10) )));
         }
         pcTemp = FindNextElement(pcTemp,"FCUInt");
@@ -635,7 +635,7 @@ std::vector<std::pair<std::string,double> > ParameterGrp::GetFloatMap(const char
         Name = StrX( ((DOMElement*)pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str();
         // check on filter condition
         if (sFilter == NULL || Name.find(sFilter)!= std::string::npos) {
-            vrValues.push_back(std::make_pair<std::string, double>(Name,
+            vrValues.push_back(std::make_pair(Name,
                                ( atof (StrX(((DOMElement*)pcTemp)->getAttribute(XStr("Value").unicodeForm())).c_str()))));
         }
         pcTemp = FindNextElement(pcTemp,"FCFloat");
@@ -735,7 +735,7 @@ std::vector<std::pair<std::string,std::string> > ParameterGrp::GetASCIIMap(const
             // retrive the text element
             DOMNode *pcElem2 = pcTemp->getFirstChild();
             if (pcElem2)
-                vrValues.push_back(std::make_pair<std::string, std::string>(Name, std::string(StrXUTF8(pcElem2->getNodeValue()).c_str())));
+                vrValues.push_back(std::make_pair(Name, std::string(StrXUTF8(pcElem2->getNodeValue()).c_str())));
         }
         pcTemp = FindNextElement(pcTemp,"FCText");
     }
diff --git a/src/FCConfig.h b/src/FCConfig.h
index 1ca5cac4c..53b151efd 100644
--- a/src/FCConfig.h
+++ b/src/FCConfig.h
@@ -132,7 +132,7 @@
 
 #ifndef HAVE_INT8_T
 #define HAVE_INT8_T
-typedef char                int8_t;
+typedef signed char                int8_t;
 #endif
 
 #ifndef HAVE_UINT8_T