diff --git a/src/api/client/context.rs b/src/api/client/context.rs
index cb95dfef..b109711e 100644
--- a/src/api/client/context.rs
+++ b/src/api/client/context.rs
@@ -105,7 +105,7 @@ pub(crate) async fn get_context_route(
 		.collect();
 
 	let (base_event, events_before, events_after): (_, Vec<_>, Vec<_>) =
-		join3(base_event, events_before, events_after).await;
+		join3(base_event, events_before, events_after).boxed().await;
 
 	let lazy_loading_context = lazy_loading::Context {
 		user_id: sender_user,
diff --git a/src/core/error/response.rs b/src/core/error/response.rs
index 00ade5ae..ae6fce62 100644
--- a/src/core/error/response.rs
+++ b/src/core/error/response.rs
@@ -86,7 +86,7 @@ pub(super) fn bad_request_code(kind: &ErrorKind) -> StatusCode {
 
 pub(super) fn ruma_error_message(error: &ruma::api::client::error::Error) -> String {
 	if let ErrorBody::Standard { message, .. } = &error.body {
-		return message.to_string();
+		return message.clone();
 	}
 
 	format!("{error}")
diff --git a/src/service/media/preview.rs b/src/service/media/preview.rs
index ba5be7d4..91660a58 100644
--- a/src/service/media/preview.rs
+++ b/src/service/media/preview.rs
@@ -256,7 +256,7 @@ pub fn url_preview_allowed(&self, url: &Url) -> bool {
 
 		if allowlist_url_contains
 			.iter()
-			.any(|url_s| url.to_string().contains(&url_s.to_string()))
+			.any(|url_s| url.to_string().contains(url_s))
 		{
 			debug!("URL {} is allowed by url_preview_url_contains_allowlist (check 4/4)", &host);
 			return true;