diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea92d995..7984b441 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,7 @@ cmake_minimum_required(VERSION 2.8)
 if(POLICY CMP0043)
     cmake_policy(SET CMP0043 OLD)
 endif()
+cmake_policy(SET CMP0005 OLD)
 
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
diff --git a/cmake/FindGit.cmake b/cmake/FindGit.cmake
index 2d821428..f5e728c0 100644
--- a/cmake/FindGit.cmake
+++ b/cmake/FindGit.cmake
@@ -35,6 +35,12 @@ endif()
 
 find_program(GIT_EXECUTABLE
   NAMES ${git_names}
+  PATHS
+    "$ENV{ProgramFiles}/Git/bin"
+    "$ENV{ProgramFiles(x86)}/Git/bin"
+    "$ENV{PATH}"
+    "/usr/bin"
+    "/usr/local/bin"
   DOC "git command line client"
   )
 mark_as_advanced(GIT_EXECUTABLE)
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index 7cf87606..313ee7f5 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -117,9 +117,9 @@ if( UNIX )
 endif( UNIX )
 
 if( WIN32 )
-  find_library( MYSQL_LIBRARY
+  find_path( MYSQL_LIBRARY_PATH
     NAMES
-      libmysql
+      libmysql.lib
     PATHS
       ${MYSQL_ADD_LIBRARIES_PATH}
       "C:/Program Files/MySQL/MySQL Server 5.6/lib"
@@ -161,8 +161,15 @@ if( WIN32 )
       "$ENV{SystemDrive}/MySQL/*/lib/opt"
       "c:/msys/local/include"
       "$ENV{MYSQL_ROOT}/lib"
+    DOC "Specify the path to the mysql library (.lib) here."
+)
+find_library( MYSQL_LIBRARY
+    NAMES
+      libmysql
+    PATHS
+      "${MYSQL_LIBRARY_PATH}"
     DOC "Specify the location of the mysql library here."
-  )
+)
 endif( WIN32 )
 
 # On Windows you typically don't need to include any extra libraries
@@ -185,6 +192,7 @@ endif( NOT WIN32 )
 if( MYSQL_LIBRARY )
   if( MYSQL_INCLUDE_DIR )
     set( MYSQL_FOUND 1 )
+    message(STATUS "Found MySQL library path: ${MYSQL_LIBRARY_PATH}")
     message(STATUS "Found MySQL library: ${MYSQL_LIBRARY}")
     message(STATUS "Found MySQL headers: ${MYSQL_INCLUDE_DIR}")
   else( MYSQL_INCLUDE_DIR )
diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt
index 0316d845..f586e2b6 100644
--- a/src/mangosd/CMakeLists.txt
+++ b/src/mangosd/CMakeLists.txt
@@ -158,9 +158,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist DESTINATION ${CONF_I
 
 if(WIN32 AND MSVC)
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb" DESTINATION "${BIN_DIR}" CONFIGURATIONS Debug)
-    add_custom_command(TARGET ${EXECUTABLE_NAME}
-        POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist" "${CONF_COPY_DIR}"
-    )
 endif()
 
 #Copy dlls to build dir
@@ -168,12 +165,12 @@ if(WIN32)
     if(MSVC)
         add_custom_command(TARGET ${EXECUTABLE_NAME}
             POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy "${MYSQL_INCLUDE_DIR}/../lib/libmysql.dll" "${CMAKE_BINARY_DIR}/bin/$(Configuration)/"
+            COMMAND ${CMAKE_COMMAND} -E copy "${MYSQL_LIBRARY_PATH}/libmysql.dll" "${CMAKE_BINARY_DIR}/bin/$(Configuration)/"
         )
     elseif(XCODE)
         add_custom_command(TARGET ${EXECUTABLE_NAME}
             POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy "${MYSQL_INCLUDE_DIR}/../lib/libmysql.dll" "${CMAKE_BINARY_DIR}/bin/"
+            COMMAND ${CMAKE_COMMAND} -E copy "${MYSQL_LIBRARY}" "${CMAKE_BINARY_DIR}/bin/"
         )
     endif()
 endif()