diff --git a/Utils/OSWrapper.h b/Utils/OSWrapper.h
index 74c978b..d3e1714 100755
--- a/Utils/OSWrapper.h
+++ b/Utils/OSWrapper.h
@@ -17,11 +17,11 @@
     #include <direct.h>
     #include <io.h>
 
-    typedef _chdir chdir;
-    typedef _getcwd getcwd;
+    #define _chdir chdir;
+    #define _getcwd getcwd;
 
     #ifdef _MSC_VER
-        typedef _access_s access;
+        #define _access_s access;
     #else
         #include <unistd.h>
     #endif
diff --git a/Utils/StringUtils.h b/Utils/StringUtils.h
index 11d2e0b..a2510c4 100755
--- a/Utils/StringUtils.h
+++ b/Utils/StringUtils.h
@@ -47,7 +47,7 @@ namespace Utils
             size_t c = 0;
             while (*haystack && c < i + match * (newLength - oldLength)) {
                 if (strstr(haystack, needle) == haystack) {
-                    strcpy(&result[c], replace);
+                    strcpy(&result[c], (char *) replace);
 
                     c        += newLength;
                     haystack += oldLength;