diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java
index e12ba08c54..3e0dd8d45c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java
@@ -10,6 +10,8 @@ import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.util.Hex;
 import org.thoughtcrime.securesms.util.Util;
 
+import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
+
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
index 3d9b1946b9..7e87f649f5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
@@ -33,7 +33,7 @@ import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 
 import org.jetbrains.annotations.NotNull;
-import org.session.libsession.messaging.sending_receiving.attachments.AttachmentServer;
+import org.thoughtcrime.securesms.attachments.AttachmentServer;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.AudioSlide;
 import org.thoughtcrime.securesms.util.ServiceUtil;
diff --git a/libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/GeneratedContactPhoto.java b/libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/GeneratedContactPhoto.java
index 9961e84f26..56a177d415 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/GeneratedContactPhoto.java
+++ b/libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/GeneratedContactPhoto.java
@@ -10,7 +10,6 @@ import android.text.TextUtils;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.content.res.AppCompatResources;
 
 import com.amulyakhare.textdrawable.TextDrawable;
 
@@ -82,10 +81,4 @@ public class GeneratedContactPhoto implements FallbackContactPhoto {
       return builder.toString();
     }
   }
-
-  @Override
-  public Drawable asCallCard(Context context) {
-    return AppCompatResources.getDrawable(context, R.drawable.ic_person_large);
-
-  }
 }
diff --git a/libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/ResourceContactPhoto.java b/libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/ResourceContactPhoto.java
index dabc30b605..5298a699a1 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/ResourceContactPhoto.java
+++ b/libsession/src/main/java/org/session/libsession/messaging/contacts/avatars/ResourceContactPhoto.java
@@ -53,11 +53,6 @@ public class ResourceContactPhoto implements FallbackContactPhoto {
     return new ExpandingLayerDrawable(new Drawable[] {background, foreground, gradient});
   }
 
-  @Override
-  public Drawable asCallCard(Context context) {
-    return AppCompatResources.getDrawable(context, callCardResourceId);
-  }
-
   private static class ExpandingLayerDrawable extends LayerDrawable {
     public ExpandingLayerDrawable(Drawable[] layers) {
       super(layers);
diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt
index ff12856545..a8e88c8702 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt
@@ -33,7 +33,7 @@ class MessageSendJob(val message: Message, val destination: Destination) : Job {
                 if(MessagingConfiguration.shared.storage.getAttachmentUploadJob(it.attachmentId) != null) {
                     // Wait for it to finish
                 } else {
-                    val job = AttachmentUploadJob(it.attachmentId, message.threadID!!, message, id!!)
+                    val job = AttachmentUploadJob(it.attachmentId, message.threadID!!.toString(), message, id!!)
                     JobQueue.shared.add(job)
                 }
             }
diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientExporter.java b/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientExporter.java
index 1fd28e0c1d..1b6b21f306 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientExporter.java
+++ b/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientExporter.java
@@ -35,10 +35,8 @@ public final class RecipientExporter {
   }
 
   private static void addAddressToIntent(Intent intent, Address address) {
-    if (address.isPhone()) {
-      intent.putExtra(ContactsContract.Intents.Insert.PHONE, address.toPhoneString());
-    } else if (address.isEmail()) {
-      intent.putExtra(ContactsContract.Intents.Insert.EMAIL, address.toEmailString());
+    if (address.isContact()) {
+      intent.putExtra(ContactsContract.Intents.Insert.PHONE, address.toString());
     } else {
       throw new RuntimeException("Cannot export Recipient with neither phone nor email");
     }