diff --git a/MakefileWin/Makefile_noqt b/MakefileWin/Makefile_noqt
index d88c196..7c3e0bd 100644
--- a/MakefileWin/Makefile_noqt
+++ b/MakefileWin/Makefile_noqt
@@ -1,39 +1,38 @@
-INCLUDES = -IC:\CAFE\cafe-1.0.0-beta-3\cpp\include -IC:\local\boost_1_63_0\boost  \
--IC:\local\boost_1_63_0 -IC:\EPICS\base-3.14.12.5\include -IC:\EPICS\base-3.14.12.5\include\os\WIN32 
+INCLUDES = -IC:\EPICS\CAFE\cpp\include -IC:\EPICS\CAFE\cpp -IC:\EPICS\boost_1_81_0\boost  \
+-IC:\EPICS\boost_1_81_0 -IC:\epics\epics-base\include -IC:\epics\epics-base\include\os\WIN32 \
+-Ic:\EPICS\epics-base\include\compiler\msvc \
 #-IC:\Qt\qt-4.8.6-x64-msvc2010\include -Ic:\Qt\qt-4.8.6-x64-msvc2010\include -Ic:\Qt\qt-4.8.6-x64-msvc2010\include\QtCore \
-#-IC:\Qt\qt-4.8.6-msvc2010\include\QtXml 
+#-IC:\Qt\qt-4.8.6-msvc2010\include\QtXml \
 #-IC:\Users\chrin\AppData\Local\Continuum\Anaconda3\envs\py345\include
-
-LIB_DEST=lib\cafe-noqt
-
 CXX=cl
-CXXFLAGS = /W4 /EHsc /c /MT
-OUTPUT_OPTION = /o "$@"
-LIB_LOCAL = C:\epics\base-3.14.12.5\lib\windows-x64\Com.lib C:\epics\base-3.14.12.5\lib\windows-x64\ca.lib \
-C:\local\boost_1_63_0\lib64-msvc-10.0\libboost_thread-vc100-mt-s-1_63.lib \
-C:\local\boost_1_63_0\lib64-msvc-10.0\libboost_system-vc100-mt-s-1_63.lib 
+CXXFLAGS = -DUSE_TYPED_RSET  -EHsc   -nologo -FC -D__STDC__=0 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE    -Ox -GL -Oy-   -W3        -MD -DEPICS_BUILD_DLL -DEPICS_CALL_DLL -c
+
+#OUTPUT_OPTION = /o "$@"
+OUTPUT_OPTION = /Fo"$@"
+LIB_LOCAL = C:\epics\epics-base\lib\win32-x86\Com.lib C:\epics\epics-base\lib\win32-x86\ca.lib \
+#C:\EPICS\boost_1_81_0\stage\lib\\libboost_thread-vc142-mt-x32-1_81.lib \
+#C:\EPICS\boost_1_81_0\stage\lib\\libboost_system-vc142-mt-gd-x32-1_81.lib \
+#C:\EPICS\boost_1_81_0\stage\lib\\libboost_date_time-vc142-mt-gd-x32-1_81.lib \
+#C:\EPICS\boost_1_81_0\stage\lib\\libboost_chrono-vc142-mt-x32-1_81.lib \
+#C:\EPICS\boost_1_81_0\stage\lib\\libboost_exception-vc142-mt-gd-x32-1_81.lib \
 #C:\Qt\qt-4.8.6-x64-msvc2010\lib\QtCore4.lib C:\Qt\qt-4.8.6-x64-msvc2010\lib\QtXml4.lib \
-#C:\Users\chrin\AppData\Local\Continuum\Anaconda3\envs\py345\libs\python34.lib 
+#C:\Users\chrin\AppData\Local\Continuum\Anaconda3\envs\py345\libs\python34.lib \
 
+OBJS= src\cafeCache.obj src\cafeGroup.obj src\cafe.obj src\cafeVectors.obj \
+			 src\callbackHandlerCreate.obj src\callbackHandlerMonitor.obj src\conduitGroup.obj src\conduit.obj \
+			 src\connectCallbacks.obj src\connectGroup.obj \
+			 src\connect.obj src\exceptionsHelper.obj src\granules.obj src\handleHelper.obj src\helper.obj \
+			 src\methodCallbacks.obj src\policyHelper.obj src\transpose.obj  \
+			 src\cafeXML.obj src\loadCollectionXMLParser.obj src\loadGroupXMLParser.obj \
+			 src\restorePVGroupXMLParser.obj $(LIB_LOCAL)
 
-OBJS= cafeCache.obj cafeGroup.obj cafe.obj cafeVectors.obj \
-			 callbackHandlerCreate.obj callbackHandlerMonitor.obj conduitGroup.obj conduit.obj \
-			 connectCallbacks.obj connectGroup.obj \
-			 connect.obj exceptionsHelper.obj granules.obj handleHelper.obj helper.obj \
-			 methodCallbacks.obj policyHelper.obj transpose.obj  \
-			 cafeXML.obj loadCollectionXMLParser.obj loadGroupXMLParser.obj \
-			 restorePVGroupXMLParser.obj $(LIB_LOCAL)
+cafe.lib: $(OBJS)
+	LIB $(OBJS) /out:cafe.lib
 
-
-
-$(LIB_DEST)\cafe.lib: $(OBJS)
-	LIB $(OBJS) /out:$(LIB_DEST)\cafe.lib
-
-
-%.obj: src\%.cpp
+%.obj: %.cpp
 	$(CXX) $(CXXFLAGS) $(INCLUDES) $(OUTPUT_OPTION) $< 
-		
+	
 clean:
-	del *.obj 
+	del src\*.obj 
 
 
diff --git a/MakefileWin/Makefile_noqt_windows7 b/MakefileWin/Makefile_noqt_windows7
new file mode 100644
index 0000000..d88c196
--- /dev/null
+++ b/MakefileWin/Makefile_noqt_windows7
@@ -0,0 +1,39 @@
+INCLUDES = -IC:\CAFE\cafe-1.0.0-beta-3\cpp\include -IC:\local\boost_1_63_0\boost  \
+-IC:\local\boost_1_63_0 -IC:\EPICS\base-3.14.12.5\include -IC:\EPICS\base-3.14.12.5\include\os\WIN32 
+#-IC:\Qt\qt-4.8.6-x64-msvc2010\include -Ic:\Qt\qt-4.8.6-x64-msvc2010\include -Ic:\Qt\qt-4.8.6-x64-msvc2010\include\QtCore \
+#-IC:\Qt\qt-4.8.6-msvc2010\include\QtXml 
+#-IC:\Users\chrin\AppData\Local\Continuum\Anaconda3\envs\py345\include
+
+LIB_DEST=lib\cafe-noqt
+
+CXX=cl
+CXXFLAGS = /W4 /EHsc /c /MT
+OUTPUT_OPTION = /o "$@"
+LIB_LOCAL = C:\epics\base-3.14.12.5\lib\windows-x64\Com.lib C:\epics\base-3.14.12.5\lib\windows-x64\ca.lib \
+C:\local\boost_1_63_0\lib64-msvc-10.0\libboost_thread-vc100-mt-s-1_63.lib \
+C:\local\boost_1_63_0\lib64-msvc-10.0\libboost_system-vc100-mt-s-1_63.lib 
+#C:\Qt\qt-4.8.6-x64-msvc2010\lib\QtCore4.lib C:\Qt\qt-4.8.6-x64-msvc2010\lib\QtXml4.lib \
+#C:\Users\chrin\AppData\Local\Continuum\Anaconda3\envs\py345\libs\python34.lib 
+
+
+OBJS= cafeCache.obj cafeGroup.obj cafe.obj cafeVectors.obj \
+			 callbackHandlerCreate.obj callbackHandlerMonitor.obj conduitGroup.obj conduit.obj \
+			 connectCallbacks.obj connectGroup.obj \
+			 connect.obj exceptionsHelper.obj granules.obj handleHelper.obj helper.obj \
+			 methodCallbacks.obj policyHelper.obj transpose.obj  \
+			 cafeXML.obj loadCollectionXMLParser.obj loadGroupXMLParser.obj \
+			 restorePVGroupXMLParser.obj $(LIB_LOCAL)
+
+
+
+$(LIB_DEST)\cafe.lib: $(OBJS)
+	LIB $(OBJS) /out:$(LIB_DEST)\cafe.lib
+
+
+%.obj: src\%.cpp
+	$(CXX) $(CXXFLAGS) $(INCLUDES) $(OUTPUT_OPTION) $< 
+		
+clean:
+	del *.obj 
+
+
diff --git a/MakefileWin/config.h b/MakefileWin/config.h
index d71cd83..ee3a908 100644
--- a/MakefileWin/config.h
+++ b/MakefileWin/config.h
@@ -1,15 +1,15 @@
 
 /* epics major release */
-#define EPICS_MAJOR 3
+#define EPICS_MAJOR 7
 
 /* epics minor release */
-#define EPICS_MINOR 14
+#define EPICS_MINOR 0
 
 /* epics patch release */
-#define EPICS_PATCH 12
+#define EPICS_PATCH 6
 
 /* epics version */
-#define HAVE_EPICS 3.14.12
+#define HAVE_EPICS 7.0.6
 
 /* Define to 1 if you have the <epicsTypes.h> header file. */
 #define HAVE_EPICSTYPES_H 1
@@ -23,3 +23,6 @@
 /* Define to 1 if you have the <Python.h> header file. */
 /*#define HAVE_PYTHON_H 1 */
 
+#ifdef _MSC_VER
+#define _CRT_SECURE_NO_WARNINGS
+#endif
diff --git a/config.log b/config.log
index 7338bb3..20232e6 100644
--- a/config.log
+++ b/config.log
@@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by CAFE configure 1.18.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
-  $ ./configure --prefix=/opt/gfa/cafe/cpp/cafe-1.18.0-gcc-7.3.0 --libdir=/opt/gfa/cafe/cpp/cafe-1.18.0-gcc-7.3.0/lib/RHEL7-x86_64 --enable-boost-inc --enable-epics7 --enable-qt5 --with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include --with-epics3=/usr/local/epics/base --with-python310=/ioc/python/latest --with-python38=/opt/gfa/python-3.8/latest --with-python37=/opt/gfa/python-3.7/latest --with-python35=/opt/gfa/python-3.5/latest --with-python34=/opt/psi/Programming/psi-python34/2.1.0 --with-qt5py310=/ioc/python/latest --with-qt5py38=/opt/gfa/python-3.8/latest --with-qt5=/opt/gfa/python-3.7/latest --with-qt4=/opt/gfa/python-3.5/latest --with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0 --with-json=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2 --with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0 --with-curl=/sf/bd/deps/zmq/curl-7.55.1 --with-lz4=/sf/bd/deps/zmq/lz4/lib --with-epics7=/usr/local/epics/base-7.0.6
+  $ ./configure --prefix=/opt/gfa/cafe/cpp/cafe-1.18.0-gcc-7.3.0 --libdir=/opt/gfa/cafe/cpp/cafe-1.18.0-gcc-7.3.0/lib/RHEL7-x86_64 --enable-boost-inc --enable-epics7 --enable-qt5 --with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include --with-epics3=/usr/local/epics/base --with-python310=/ioc/python/latest --with-python38=/opt/gfa/python-3.8/latest --with-python37=/opt/gfa/python-3.7/latest --with-python35=/opt/gfa/python-3.5/latest --with-python34=/opt/psi/Programming/psi-python34/2.1.0 --with-qt5py310=/ioc/python/latest --with-qt5py38=/opt/gfa/python-3.8/latest --with-qt5=/opt/gfa/python-3.7/latest --with-qt4=/opt/gfa/python-3.5/latest --with-qt4py34=/opt/psi/Programming/psi-python34/2.1.0 --with-json=/sf/bd/deps/zmq/json/jsoncpp-src-0.6.0-rc2 --with-zeromq=/sf/bd/deps/zmq/zeromq-4.2.3-gcc-6.3.0 --with-curl=/sf/bd/deps/zmq/curl-7.55.1 --with-lz4=/sf/bd/deps/zmq/lz4/lib --with-epics7=/usr/local/epics/base-7.0.6 CXX=/opt/psi/Programming/gcc/7.3.0/bin/g++ CC=/opt/psi/Programming/gcc/7.3.0/bin/gcc --no-create --no-recursion
 
 ## --------- ##
 ## Platform. ##
@@ -44,6 +44,7 @@ PATH: /opt/psi/Tools/Pmodules/0.99.10/bin
 PATH: /opt/puppetlabs/bin
 PATH: /afs/psi.ch/project/zeromq/deps/pycharm-community-2018.1.4/bin
 PATH: /afs/psi.ch/user/c/chrin/Downloads/astyle/build/gcc/bin
+PATH: /afs/psi.ch/user/c/chrin/.local/bin
 PATH: /afs/psi.ch/user/c/chrin/python/pycharm-community-2018.1.4/bin
 PATH: /afs/psi.ch/user/c/chrin/bin
 
@@ -542,28 +543,6 @@ configure:18061: checking that generated files are newer than configure
 configure:18067: result: done
 configure:18106: creating ./config.status
 
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by CAFE config.status 1.18.0, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status 
-
-on sf-lc7.psi.ch
-
-config.status:1178: creating makefile
-config.status:1178: creating src/makefile
-config.status:1178: creating include/makefile
-config.status:1178: creating ./include/config.h
-config.status:1407: executing depfiles commands
-config.status:1407: executing libtool commands
-
 ## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##
@@ -844,10 +823,10 @@ target_alias=''
 #define HAVE_LINUX 1
 #define HAVE_CADEF_H 1
 #define HAVE_EPICSTYPES_H 1
-#define HAVE_EPICS 3.14.12
-#define EPICS_MAJOR 3
-#define EPICS_MINOR 14
-#define EPICS_PATCH 12
+#define HAVE_EPICS 7.4.1
+#define EPICS_MAJOR 7
+#define EPICS_MINOR 4
+#define EPICS_PATCH 1
 #define HAVE_MULTI_INDEX_CONTAINER_HPP 1
 #define HAVE_BOOST 1
 #define HAVE_QXML_H 1
@@ -858,3 +837,43 @@ target_alias=''
 #define QT_NO_VERSION_TAGGING 1
 
 configure: exit 0
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by CAFE config.status 1.18.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ./config.status 
+
+on sf-lc7.psi.ch
+
+config.status:1178: creating makefile
+config.status:1178: creating src/makefile
+config.status:1178: creating include/makefile
+config.status:1178: creating ./include/config.h
+config.status:1407: executing depfiles commands
+config.status:1407: executing libtool commands
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by CAFE config.status 1.18.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ./config.status ./include/config.h
+
+on sf-lc7.psi.ch
+
+config.status:1178: creating ./include/config.h
+config.status:1359: ./include/config.h is unchanged
diff --git a/config.status b/config.status
index d7f8db9..21e8ae6 100755
--- a/config.status
+++ b/config.status
@@ -1076,10 +1076,10 @@ D["LT_OBJDIR"]=" \".libs/\""
 D["HAVE_LINUX"]=" 1"
 D["HAVE_CADEF_H"]=" 1"
 D["HAVE_EPICSTYPES_H"]=" 1"
-D["HAVE_EPICS"]=" 3.14.12"
-D["EPICS_MAJOR"]=" 3"
-D["EPICS_MINOR"]=" 14"
-D["EPICS_PATCH"]=" 12"
+D["HAVE_EPICS"]=" 7.4.1"
+D["EPICS_MAJOR"]=" 7"
+D["EPICS_MINOR"]=" 4"
+D["EPICS_PATCH"]=" 1"
 D["HAVE_MULTI_INDEX_CONTAINER_HPP"]=" 1"
 D["HAVE_BOOST"]=" 1"
 D["HAVE_QXML_H"]=" 1"
diff --git a/examples/cafeTest/makefile_local_win b/examples/cafeTest/makefile_local_win
index 7736128..7c81ebc 100644
--- a/examples/cafeTest/makefile_local_win
+++ b/examples/cafeTest/makefile_local_win
@@ -1,22 +1,26 @@
-INCLUDES = -Ic:\CAFE\CAFE\cpp\include -Ic:\CAFE\CAFE\cpp -Ic:\local\boost_1_62_0 \
--Ic:\local\boost_1_62_0\boost  -Ic:\epics\base-3.14.12.5\include -Ic:\epics\base-3.14.12.5\include\os\WIN32 \
--Ic:\Qt\4.8.4\include
+INCLUDES = -Ic:\EPICS\CAFE\cpp\include -Ic:\EPICS\CAFE\cpp -Ic:\EPICS\boost_1_81_0 \
+-Ic:\EPICS\boost_1_81_0\boost  -IC:\epics\epics-base\include -IC:\epics\epics-base\include\os\WIN32 \
+-Ic:\EPICS\epics-base\include\compiler\msvc \
+#-Ic:\Qt\4.8.4\include
 CXX=cl
-CXXFLAGS = /W4 /EHsc
-OUTPUT_OPTION = /o $@
-LIB_LOCAL = C:\epics\base-3.14.12.5\lib\windows-x64\Com.lib C:\epics\base-3.14.12.5\lib\windows-x64\ca.lib \
-C:\CAFE\CAFE\cpp\cafe.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_thread-vc100-mt-s-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_system-vc100-mt-s-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_date_time-vc100-mt-s-1_62.lib \
-C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_chrono-vc100-mt-s-1_62.lib \
-C:\Qt\4.8.4\lib\QtCore4.lib C:\Qt\4.8.4\lib\QtXml4.lib
+CXXFLAGS = -DUSE_TYPED_RSET  -EHsc   -nologo -FC -D__STDC__=0 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE    -Ox -GL -Oy-   -W3        -MD -DEPICS_BUILD_DLL -DEPICS_CALL_DLL -c
+OUTPUT_OPTION = /Fo"$@"
+LIB_LOCAL = C:\epics\epics-base\lib\win32-x86\Com.lib C:\epics\epics-base\lib\win32-x86\ca.lib \
+C:\EPICS\CAFE\cpp\cafe.lib \
+C:\EPICS\boost_1_81_0\stage\lib\\libboost_thread-vc142-mt-x32-1_81.lib \
+C:\EPICS\boost_1_81_0\stage\lib\\libboost_system-vc142-mt-x32-1_81.lib \
+C:\EPICS\boost_1_81_0\stage\lib\\libboost_date_time-vc142-mt-x32-1_81.lib \
+C:\EPICS\boost_1_81_0\stage\lib\\libboost_chrono-vc142-mt-x32-1_81.lib \
+# C:\Qt\4.8.4\lib\QtCore4.lib C:\Qt\4.8.4\lib\QtXml4.lib
 
 cafeTest: cafeTest.obj
-	$(CXX) cafeTest.obj $(LIB_LOCAL) 
+	link -nologo  -LTCG -incremental:no -opt:ref -release cafeTest.obj $(LIB_LOCAL)
 	
-cafeTest.obj: cafeTest.cpp
-	$(CXX) $(CXXFLAGS) $(INCLUDES) /c cafeTest.cpp
+cafeTest.obj: cafeTest.cc
+	$(CXX) $(CXXFLAGS) $(INCLUDES) cafeTest.cc
+
+clean:
+	del *.obj 
 	
 #"C:\Program Files (x86)\GnuWin32\bin\make" 
 
diff --git a/examples/cafeTest/makefile_local_windows7 b/examples/cafeTest/makefile_local_windows7
new file mode 100644
index 0000000..7736128
--- /dev/null
+++ b/examples/cafeTest/makefile_local_windows7
@@ -0,0 +1,23 @@
+INCLUDES = -Ic:\CAFE\CAFE\cpp\include -Ic:\CAFE\CAFE\cpp -Ic:\local\boost_1_62_0 \
+-Ic:\local\boost_1_62_0\boost  -Ic:\epics\base-3.14.12.5\include -Ic:\epics\base-3.14.12.5\include\os\WIN32 \
+-Ic:\Qt\4.8.4\include
+CXX=cl
+CXXFLAGS = /W4 /EHsc
+OUTPUT_OPTION = /o $@
+LIB_LOCAL = C:\epics\base-3.14.12.5\lib\windows-x64\Com.lib C:\epics\base-3.14.12.5\lib\windows-x64\ca.lib \
+C:\CAFE\CAFE\cpp\cafe.lib \
+C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_thread-vc100-mt-s-1_62.lib \
+C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_system-vc100-mt-s-1_62.lib \
+C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_date_time-vc100-mt-s-1_62.lib \
+C:\local\boost_1_62_0\lib64-msvc-10.0\libboost_chrono-vc100-mt-s-1_62.lib \
+C:\Qt\4.8.4\lib\QtCore4.lib C:\Qt\4.8.4\lib\QtXml4.lib
+
+cafeTest: cafeTest.obj
+	$(CXX) cafeTest.obj $(LIB_LOCAL) 
+	
+cafeTest.obj: cafeTest.cpp
+	$(CXX) $(CXXFLAGS) $(INCLUDES) /c cafeTest.cpp
+	
+#"C:\Program Files (x86)\GnuWin32\bin\make" 
+
+
diff --git a/include/config.h b/include/config.h
index 970f0de..2406930 100644
--- a/include/config.h
+++ b/include/config.h
@@ -2,13 +2,13 @@
 /* ./include/config.in.  Generated from configure.ac by autoheader.  */
 
 /* epics major release */
-#define EPICS_MAJOR 3
+#define EPICS_MAJOR 7
 
 /* epics minor release */
-#define EPICS_MINOR 14
+#define EPICS_MINOR 4
 
 /* epics patch release */
-#define EPICS_PATCH 12
+#define EPICS_PATCH 1
 
 /* Availability of boost */
 #define HAVE_BOOST 1
@@ -29,7 +29,7 @@
 #define HAVE_DLFCN_H 1
 
 /* epics version */
-#define HAVE_EPICS 3.14.12
+#define HAVE_EPICS 7.4.1
 
 /* Define to 1 if you have the <epicsTypes.h> header file. */
 #define HAVE_EPICSTYPES_H 1
diff --git a/include/policies.h b/include/policies.h
index 551a858..16e2572 100644
--- a/include/policies.h
+++ b/include/policies.h
@@ -120,7 +120,7 @@ public:
     }
     unsigned short setPriority(unsigned short p)
     {
-        priority=std::min(p,(unsigned short) CA_SERVER_DISPATCH_PRIORITY_MAX);
+        priority=(std::min)(p,(unsigned short) CA_SERVER_DISPATCH_PRIORITY_MAX);
         return priority;
     }
 
@@ -462,17 +462,17 @@ public:
     };
     double setTimeout(double t)
     {
-        timeout=std::max(t,TIMEOUT_PEND_IO_MIN);
-        return timeout=std::min(timeout,TIMEOUT_PEND_IO_MAX);
+        timeout=(std::max)(t,TIMEOUT_PEND_IO_MIN);
+        return timeout=(std::min)(timeout,TIMEOUT_PEND_IO_MAX);
     };
     double setDeltaTimeout(double dt)
     {
-        deltaTimeout=std::max(dt,PEND_IO_INCREMENT_TIME_MIN);
-        return deltaTimeout=std::min(deltaTimeout,PEND_IO_INCREMENT_TIME_MAX);
+        deltaTimeout=(std::max)(dt,PEND_IO_INCREMENT_TIME_MIN);
+        return deltaTimeout=(std::min)(deltaTimeout,PEND_IO_INCREMENT_TIME_MAX);
     };
     unsigned short setNtries(unsigned short nt)
     {
-        return ntries=std::min(nt, PEND_IO_MAX_TRIES);
+        return ntries=(std::min)(nt, PEND_IO_MAX_TRIES);
     };
 
     double setDefaultTimeout(double t)
diff --git a/include/policyHelper.h b/include/policyHelper.h
index 0dfff48..b2c5287 100644
--- a/include/policyHelper.h
+++ b/include/policyHelper.h
@@ -113,7 +113,7 @@ public:
         double g;
         int  st;
         st=getTimeout(_handle, p, g);
-        pg=std::min(p,g);
+        pg=(std::min)(p,g);
         return st;
     }
     int  getTimeoutPut(unsigned int  _handle, double &p)
@@ -192,7 +192,7 @@ public:
         double g;
         int  st;
         st=getSGTimeout(_handle, p, g);
-        pg=std::min(p,g);
+        pg=(std::min)(p,g);
         return st;
     }
     int  getSGTimeoutPut(unsigned int  _handle, double &p)
diff --git a/makefile b/makefile
index 2756db4..771bdd4 100644
--- a/makefile
+++ b/makefile
@@ -85,10 +85,11 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
 	$(top_srcdir)/./include/config.in $(include_HEADERS) \
 	.//AUTHORS COPYING .//COPYING .//ChangeLog .//INSTALL .//NEWS \
 	.//README config.guess .//config.guess config.sub \
-	.//config.sub install-sh .//install-sh missing .//missing \
-	ltmain.sh .//ltmain.sh $(top_srcdir)/./config.guess \
-	$(top_srcdir)/./config.sub $(top_srcdir)/./install-sh \
-	$(top_srcdir)/./ltmain.sh $(top_srcdir)/./missing
+	.//config.sub depcomp .//depcomp install-sh .//install-sh \
+	missing .//missing ltmain.sh .//ltmain.sh \
+	$(top_srcdir)/./config.guess $(top_srcdir)/./config.sub \
+	$(top_srcdir)/./install-sh $(top_srcdir)/./ltmain.sh \
+	$(top_srcdir)/./missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/src/cafe.cpp b/src/cafe.cpp
index bcfd76d..1043a5b 100644
--- a/src/cafe.cpp
+++ b/src/cafe.cpp
@@ -88,7 +88,13 @@ int CAFE::wfExpress(const unsigned int handle,  const unsigned int nelem, dbr_ch
       ca_flush_io();
       for (int i=0; i <20; ++i) {
 
-	sleep(0.05);
+#if HAVE_BOOST_THREAD
+        boost::this_thread::sleep_for(boost::chrono::milliseconds(50));
+#else
+#if HAVE_LINUX
+	    sleep(0.05);
+#endif
+#endif
 	//std::cout << "iscb done " << cafeGranules.isGetCallbackDone(handle) << std::endl;
 
       }
@@ -5238,7 +5244,13 @@ int CAFE::supplementHandlesV(std::vector<unsigned int> hV)
     for (int ij=0; ij<20; ++ij) {
 	    if (!initCallbackComplete(allHandles) ) {
 	      //cout << "Will wait for " << ij << " " << (1+ij)*0.1 << " ======= SECONDS ==== " << endl;
-	      usleep(100000); //tenth of a sec and loop over 2 sec
+#if HAVE_BOOST_THREAD
+                boost::this_thread::sleep_for(boost::chrono::microseconds(100000)); //tenth of a sec and loop over 2 sec
+#else
+#if HAVE_LINUX
+                usleep(100000); //tenth of a sec and loop over 2 sec
+#endif
+#endif
 	    }
      }
    
diff --git a/src/connect.cpp b/src/connect.cpp
index 5ae937c..14ea5fe 100644
--- a/src/connect.cpp
+++ b/src/connect.cpp
@@ -197,7 +197,7 @@ int Connect::createChannel(unsigned int handle, const char * pv, chid &pCh)
             {
 
 #if HAVE_BOOST_THREAD
-                boost::this_thread::sleep_for(boost::chrono::microseconds(microSedcondsWait));
+                boost::this_thread::sleep_for(boost::chrono::microseconds(microSecondsWait));
 #else
 #if HAVE_LINUX
                 usleep(microSecondsWait);