diff --git a/docker/Dockerfile b/docker/Dockerfile
index a7f9e1adc779e27510b6f5f21042e15fade75b4f..00f047bf9e8cfe530939de544f3645f976876118 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -48,11 +48,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     zip \
     && locale-gen $LANG $LC_ALL && update-locale $LANG $LC_ALL
 
-# Install Swig 4.1.1
-RUN wget -O /tmp/swig.tar.gz https://github.com/swig/swig/archive/v4.1.1.tar.gz && \
-    tar xzf /tmp/swig.tar.gz -C /opt && \
-    cd /opt/swig-4.1.1/ && ./autogen.sh && ./configure && make && make install && \
-    cd .. && rm -rf /opt/swig-4.1.1 /tmp/swig.tar.gz
+# Swig
+RUN wget -O /tmp/swig.tar.gz https://github.com/swig/swig/archive/v4.2.1.tar.gz && \
+	tar xzf  /tmp/swig.tar.gz -C /opt && \
+	cd /opt/swig-4.2.1/ && ./autogen.sh && ./configure && make && make install && \
+	cd .. && rm -rf /opt/swig-4.2.1 /tmp/swig.tar.gz
 
 # Install Fastlane
 RUN gem install fastlane -NV
diff --git a/jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt
index 7c2e603b8cef4c579ce440ff68b8f062c2bc1e8d..a43f14fb14ae417bf18d3c3ebeda419bb39a15d0 100644
--- a/jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt
+++ b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt
@@ -693,7 +693,7 @@ class AccountService(
     fun setActiveCodecList(accountId: String, codecs: List<Long>) {
         mExecutor.execute {
             val list = UintVect()
-            list.reserve(codecs.size.toLong())
+            list.reserve(codecs.size)
             list.addAll(codecs)
             JamiService.setActiveCodecList(accountId, list)
             observableAccounts.onNext(getAccount(accountId) ?: return@execute)
diff --git a/jami-android/libjamiclient/src/main/kotlin/net/jami/services/CallService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/CallService.kt
index 90fcee1a0575a8d28ce9663400835efa8a86468c..65c3b042430bb3e398e241f2d9678af8ae14e38c 100644
--- a/jami-android/libjamiclient/src/main/kotlin/net/jami/services/CallService.kt
+++ b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/CallService.kt
@@ -223,7 +223,7 @@ abstract class CallService(
         Single.fromCallable<Call> {
             Log.i(TAG, "placeCall() thread running... $number hasVideo: $hasVideo")
             val media = VectMap()
-            media.reserve(if (hasVideo) 2L else 1L)
+            media.reserve(if (hasVideo) 2 else 1)
             media.add(Media.DEFAULT_AUDIO.toMap())
             if (hasVideo)
                 media.add(Media.DEFAULT_VIDEO.toMap())
@@ -248,7 +248,7 @@ abstract class CallService(
             Log.i(TAG, "accept() running... $callId")
             val call = calls[callId] ?: return@execute
             val mediaList = call.mediaList
-            val vectMapMedia = mediaList.mapTo(VectMap().apply { reserve(mediaList.size.toLong()) }) { media ->
+            val vectMapMedia = mediaList.mapTo(VectMap().apply { reserve(mediaList.size) }) { media ->
                 if (!hasVideo && media.mediaType == Media.MediaType.MEDIA_TYPE_VIDEO)
                     media.copy(isMuted = true).toMap()
                 else
@@ -619,7 +619,7 @@ abstract class CallService(
                 call.account,
                 call.daemonIdString,
                 proposedMediaList.mapTo(VectMap().apply {
-                    reserve(proposedMediaList.size.toLong())
+                    reserve(proposedMediaList.size)
                 }) { it.toMap() }
             )
         }
diff --git a/jami-android/libjamiclient/src/main/kotlin/net/jami/utils/SwigNativeConverter.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/utils/SwigNativeConverter.kt
index ddce232c6cbaac3ebc63651d5099936c7396ec72..ec4054c944f1f31b77af0e3b0aa2419a6e3631aa 100644
--- a/jami-android/libjamiclient/src/main/kotlin/net/jami/utils/SwigNativeConverter.kt
+++ b/jami-android/libjamiclient/src/main/kotlin/net/jami/utils/SwigNativeConverter.kt
@@ -21,7 +21,7 @@ import java.util.ArrayList
 
 object SwigNativeConverter {
     fun toSwig(creds: List<Map<String, String>>): VectMap =
-        creds.mapTo(VectMap().apply { reserve(creds.size.toLong()) }) {
+        creds.mapTo(VectMap().apply { reserve(creds.size) }) {
             StringMap.toSwig(it)
         }