diff --git a/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java b/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java
index 3c55d91f1..a4f4d0b0e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java
@@ -251,8 +251,10 @@ public class BriarService extends Service {
 			Glide.get(getApplicationContext()).clearMemory();
 		} else if (level == TRIM_MEMORY_RUNNING_LOW) {
 			LOG.info("Trim memory: running low");
+			// TODO investigate if we can clear Glide cache here as well
 		} else if (level == TRIM_MEMORY_RUNNING_CRITICAL) {
 			LOG.warning("Trim memory: running critically low");
+			// TODO investigate if we can clear Glide cache here as well
 			// If we're not in the foreground, clear the UI to save memory
 			if (app.isRunningInBackground()) hideUi();
 		} else if (LOG.isLoggable(INFO)) {
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java
index 6f7521d58..1bf66256e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java
@@ -44,10 +44,12 @@ import static org.briarproject.bramble.util.LogUtils.logException;
 abstract class SharingStatusActivity extends BriarActivity
 		implements EventListener {
 
+	// objects accessed from background thread need to be volatile
 	@Inject
-	AuthorManager authorManager;
+	volatile AuthorManager authorManager;
 	@Inject
-	ConnectionRegistry connectionRegistry;
+	volatile ConnectionRegistry connectionRegistry;
+
 	@Inject
 	EventBus eventBus;