diff --git a/appveyor.yml b/appveyor.yml
index fdaf8e8a..7a15ba33 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -66,4 +66,4 @@ build_script:
 
 cache:
 - deps                          # Ninja installation
-- c:\Users\appveyor\conanCache  # Conan cache
+  #- c:\Users\appveyor\conanCache  # Conan cache
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 8546bc8e..d056420e 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -114,7 +114,10 @@ list(APPEND APPLICATIONS remotetest)
 foreach(application ${APPLICATIONS})
     target_link_libraries(${application} PRIVATE exiv2lib)
     if( EXIV2_ENABLE_PNG )
-        target_link_libraries( ${application} PRIVATE ${ZLIB_LIBRARIES} )
+        target_link_libraries(${application} PRIVATE ${ZLIB_LIBRARIES} )
+	if (MSVC)
+	    set_target_properties(${application} PROPERTIES LINK_FLAGS "/ignore:4099") # Ignore missing PDBs
+	endif()
     endif()
 endforeach()
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 71f749e3..0813dc14 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -133,10 +133,9 @@ set_target_properties( exiv2lib_int PROPERTIES
     COMPILE_DEFINITIONS exiv2lib_EXPORTS
 )
 
-target_include_directories(exiv2lib_int PRIVATE ${ZLIB_INCLUDE_DIR})
+target_link_libraries(exiv2lib_int PRIVATE ZLIB::ZLIB)
 target_include_directories(exiv2lib SYSTEM PRIVATE 
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/xmpsdk/include>
-    ${ZLIB_INCLUDE_DIR}
 )
 
 if (EXIV2_ENABLE_XMP)
@@ -188,7 +187,7 @@ else()
 endif()
 
 if( EXIV2_ENABLE_PNG )
-    target_link_libraries( exiv2lib PRIVATE $<BUILD_INTERFACE:${ZLIB_LIBRARIES}>)
+	target_link_libraries( exiv2lib PRIVATE ZLIB::ZLIB)
 endif()
 
 if( EXIV2_ENABLE_NLS )
@@ -237,6 +236,9 @@ if(EXIV2_BUILD_EXIV2_COMMAND)
         COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS}
         XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS[variant=Debug] "YES"
     )
+    if (MSVC)
+        set_target_properties(exiv2 PROPERTIES LINK_FLAGS "/ignore:4099") # Ignore missing PDBs
+    endif()
 
     target_link_libraries( exiv2 PRIVATE exiv2lib )