diff --git a/cmake/Modules/FindIconv.cmake b/cmake/Modules/FindIconv.cmake
index 9ce2fa7fce..33a25d9d23 100644
--- a/cmake/Modules/FindIconv.cmake
+++ b/cmake/Modules/FindIconv.cmake
@@ -17,12 +17,14 @@ ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
 IF(APPLE)
     FIND_PATH(ICONV_INCLUDE_DIR iconv.h
              PATHS
+             /usr/include/
              /opt/local/include/
              NO_CMAKE_SYSTEM_PATH
     )
 
     FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c
              PATHS
+             /usr/lib/
              /opt/local/lib/
              NO_CMAKE_SYSTEM_PATH
     )
diff --git a/src/csync_exclude.c b/src/csync_exclude.c
index 02c4fc028a..166f5f2e4b 100644
--- a/src/csync_exclude.c
+++ b/src/csync_exclude.c
@@ -64,6 +64,8 @@ int csync_exclude_load(CSYNC *ctx, const char *fname) {
   char *entry = NULL;
   const _TCHAR *wfname;
 
+  CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Loading exclude file: %s", fname);
+
 #ifdef _WIN32
   _fmode = _O_BINARY;  
 #endif
diff --git a/src/csync_propagate.c b/src/csync_propagate.c
index 89804095e2..37c6e0e9f6 100644
--- a/src/csync_propagate.c
+++ b/src/csync_propagate.c
@@ -189,7 +189,11 @@ static int _csync_push_file(CSYNC *ctx, csync_file_stat_t *st) {
 
   if (_push_to_tmp_first(ctx)) {
       /* create the temporary file name */
+#ifdef _WIN32
+      if (asprintf(&turi, "%s.~XXXXXX", duri) < 0) {
+#else
       if (asprintf(&turi, ".%s.~XXXXXX", duri) < 0) {
+#endif
           rc = -1;
           goto out;
       }