diff --git a/cmake-proxies/CMakeLists.txt b/cmake-proxies/CMakeLists.txt
index 74d609ef2..724bbd2ee 100644
--- a/cmake-proxies/CMakeLists.txt
+++ b/cmake-proxies/CMakeLists.txt
@@ -18,14 +18,17 @@ add_conan_lib(
       expat:shared=True
 )
 
-set(wx_zlib "zlib")
-set(wx_png "libpng")
+set( wx_zlib "zlib" )
+set( wx_png "libpng" )
+set( id3tag_zlib "conan" )
 
-if (${_OPT}use_zlib STREQUAL "system")
-   set(wx_zlib "sys")
+if ( ${_OPT}use_zlib STREQUAL "system" )
+   set( wx_zlib "sys" )
    # To prevent linking conflicts - we need to use system libpng as well.
    # wxWdigets will attempt to resolve it using find_package
-   set(wx_png "sys")
+   set( wx_png "sys" )
+
+   set( id3tag_zlib "system" )
 endif()
 
 set(wx_expat "expat")
@@ -72,17 +75,17 @@ add_conan_lib(
 
 add_conan_lib(
    libid3tag
-   libid3tag/0.15.1b
+   libid3tag/0.15.2b@audacity/stable
    OPTION_NAME id3tag
-   HAS_ONLY_DEBUG_RELEASE
    PGK_CONFIG "id3tag >= 0.15.1b"
+   CONAN_OPTIONS
+      libid3tag:zlib=${id3tag_zlib}
 )
 
 add_conan_lib(
    libmad
-   libmad/0.15.1b
+   libmad/0.15.2b@audacity/stable
    OPTION_NAME mad
-   HAS_ONLY_DEBUG_RELEASE
    PGK_CONFIG "mad >= 0.15.1b"
 )
 
diff --git a/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake b/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
index 2deafda7e..2def9ae85 100644
--- a/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
+++ b/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
@@ -35,6 +35,10 @@ if( ${_OPT}use_wxwidgets STREQUAL "system" )
         add_library( wxwidgets::adv ALIAS wxwidgets::wxwidgets )
     endif()
 
+    if( NOT TARGET wxBase )
+        add_library( wxBase ALIAS wxwidgets::wxwidgets )
+    endif()
+
     if( NOT TARGET wxwidgets::wxwidgets )
         add_library( wxwidgets::wxwidgets ALIAS wxwidgets::wxwidgets )
     endif()
@@ -80,6 +84,9 @@ if( ${_OPT}use_wxwidgets STREQUAL "system" )
         set( gtk gtk+-4.0 )
         set( glib glib-2.0 )
     endif()
+else()
+    set_target_properties(wxwidgets::base PROPERTIES IMPORTED_GLOBAL On)
+    add_library( wxBase ALIAS wxwidgets::base )
 endif()
 
 if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" )
@@ -93,5 +100,3 @@ if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" )
     pkg_check_modules( GLIB REQUIRED IMPORTED_TARGET GLOBAL ${glib} )
 endif()
 
-set_target_properties(wxwidgets::base PROPERTIES IMPORTED_GLOBAL On)
-add_library( wxBase ALIAS wxwidgets::base )