diff --git a/.gitlab-ci-files/macosx-desktop.yml b/.gitlab-ci-files/macosx-desktop.yml
index da1767f0b..bfcc5bd74 100644
--- a/.gitlab-ci-files/macosx-desktop.yml
+++ b/.gitlab-ci-files/macosx-desktop.yml
@@ -24,7 +24,7 @@
 
 .macosx-desktop:
   stage: build
-  tags: [ "macos-xcode13" ]
+  tags: [ "macos-xcode15" ]
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_MACOSX == null
     - if: $CI_PIPELINE_SOURCE == "schedule" && $DOCKER_UPDATE == null && $SKIP_MACOSX == null
@@ -91,7 +91,7 @@ macosx-ninja-novideo:
 # WAIT for QT6 for arm64
 macosx-makefile-package:
   stage: package
-  tags: [ "macos-xcode13" ]
+  tags: [ "macos-xcode15" ]
   dependencies: []
   rules:
     - !reference [.rules-merge-request-manual, rules]
@@ -115,7 +115,7 @@ macosx-makefile-package:
 
 macosx-codesigning:
   stage: signing
-  tags: [ "macos-xcode13" ]
+  tags: [ "macos-xcode15" ]
   needs:
     - macosx-makefile-package
   rules:
@@ -140,7 +140,7 @@ macosx-codesigning:
 
 macosx-makefile-deploy:
  stage: deploy
- tags: [ "macos-xcode13" ]
+ tags: [ "macos-xcode15" ]
  needs:
    - macosx-codesigning
  only:
@@ -158,7 +158,7 @@ macosx-makefile-deploy:
 
 macosx-makefile-plugins-deploy:
  stage: deploy
- tags: [ "macos-xcode13" ]
+ tags: [ "macos-xcode15" ]
  needs:
    - macosx-makefile
  only:
diff --git a/Linphone/CMakeLists.txt b/Linphone/CMakeLists.txt
index 4674ff1f7..2a98fd691 100644
--- a/Linphone/CMakeLists.txt
+++ b/Linphone/CMakeLists.txt
@@ -40,9 +40,9 @@ endif()
 ################################################################
 #						CONFIGS
 ################################################################
-if(NOT WIN32)
-	add_compile_options(-Werror=deprecated-declarations)
-endif()
+#if(NOT WIN32)
+#	add_compile_options(-Werror=deprecated-declarations)
+#endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -DQT_NO_DEBUG")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG")
diff --git a/Linphone/core/conference/ConferenceInfoList.cpp b/Linphone/core/conference/ConferenceInfoList.cpp
index 7fe5e41ac..e29e92e73 100644
--- a/Linphone/core/conference/ConferenceInfoList.cpp
+++ b/Linphone/core/conference/ConferenceInfoList.cpp
@@ -236,6 +236,10 @@ int ConferenceInfoList::sort(QList<QSharedPointer<ConferenceInfoCore>> &listToSo
 	          [nowDate](const QSharedPointer<QObject> &a, const QSharedPointer<QObject> &b) {
 		          auto l = a.objectCast<ConferenceInfoCore>();
 		          auto r = b.objectCast<ConferenceInfoCore>();
+		          if (!l && !r) {
+			          lCritical() << "[ConferenceInfoList] there are 2 null pointers in list that should not happen!";
+			          return false;
+		          }
 		          if (!l || !r) { // sort on date
 			          return !l ? nowDate <= r->getDateTimeUtc().date() : l->getDateTimeUtc().date() < nowDate;
 		          } else {