diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
index b2d5edef7a..59f196b372 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -351,7 +351,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   @WorkerThread
   private void initializeCircumvention() {
-    if (new SignalServiceNetworkAccess(ApplicationContext.this).isCensored(ApplicationContext.this)) {
+    if (ApplicationDependencies.getSignalServiceNetworkAccess().isCensored(ApplicationContext.this)) {
       try {
         ProviderInstaller.installIfNeeded(ApplicationContext.this);
       } catch (Throwable t) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
index 63bfe6c738..c3e4e66037 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
@@ -60,7 +60,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
   protected final void onCreate(Bundle savedInstanceState) {
     Tracer.getInstance().start(Log.tag(getClass()) + "#onCreate()");
     AppStartup.getInstance().onCriticalRenderEventStart();
-    this.networkAccess = new SignalServiceNetworkAccess(this);
+    this.networkAccess = ApplicationDependencies.getSignalServiceNetworkAccess();
     onPreCreate();
 
     final boolean locked = KeyCachingService.isLocked(this);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteProximityWakeLockManager.kt b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteProximityWakeLockManager.kt
index 21aad4df9a..58d4d393fa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteProximityWakeLockManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteProximityWakeLockManager.kt
@@ -30,7 +30,7 @@ class VoiceNoteProximityWakeLockManager(
 ) : DefaultLifecycleObserver {
 
   private val wakeLock: PowerManager.WakeLock? = if (Build.VERSION.SDK_INT >= 21) {
-    ServiceUtil.getPowerManager(activity).newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, TAG)
+    ServiceUtil.getPowerManager(activity.applicationContext).newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, TAG)
   } else {
     null
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java b/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java
index c66484f84f..a8b8f8287e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java
@@ -9,6 +9,7 @@ import com.google.android.gms.security.ProviderInstaller;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.BuildConfig;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.push.ACI;
@@ -24,7 +25,7 @@ public class AccountManagerFactory {
                                                                          @NonNull String number,
                                                                          @NonNull String password)
   {
-    if (new SignalServiceNetworkAccess(context).isCensored(number)) {
+    if (ApplicationDependencies.getSignalServiceNetworkAccess().isCensored(number)) {
       SignalExecutors.BOUNDED.execute(() -> {
         try {
           ProviderInstaller.installIfNeeded(context);
@@ -34,7 +35,7 @@ public class AccountManagerFactory {
       });
     }
 
-    return new SignalServiceAccountManager(new SignalServiceNetworkAccess(context).getConfiguration(number),
+    return new SignalServiceAccountManager(ApplicationDependencies.getSignalServiceNetworkAccess().getConfiguration(number),
                                            aci,
                                            number,
                                            password,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/CensorshipUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/CensorshipUtil.java
index 418ddd8d3e..c401d6c423 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/CensorshipUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/CensorshipUtil.java
@@ -4,6 +4,7 @@ import android.content.Context;
 
 import androidx.annotation.NonNull;
 
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 
 public final class CensorshipUtil {
@@ -11,6 +12,6 @@ public final class CensorshipUtil {
   private CensorshipUtil() {}
 
   public static boolean isCensored(@NonNull Context context) {
-    return new SignalServiceNetworkAccess(context).isCensored(context);
+    return ApplicationDependencies.getSignalServiceNetworkAccess().isCensored(context);
   }
 }
diff --git a/app/src/mock/java/org/thoughtcrime/securesms/MockAppDataInitializer.java b/app/src/mock/java/org/thoughtcrime/securesms/MockAppDataInitializer.java
index e253cbbce1..61fa8ddb97 100644
--- a/app/src/mock/java/org/thoughtcrime/securesms/MockAppDataInitializer.java
+++ b/app/src/mock/java/org/thoughtcrime/securesms/MockAppDataInitializer.java
@@ -100,7 +100,7 @@ final class MockAppDataInitializer {
 
     TextSecurePreferences.setPromptedPushRegistration(context, true);
     TextSecurePreferences.setLocalNumber(context, localE164);
-    TextSecurePreferences.setLocalUuid(context, Recipient.external(context, localE164).requireUuid());
+    TextSecurePreferences.setLocalAci(context, Recipient.external(context, localE164).requireAci());
     TextSecurePreferences.setPushRegistered(context, true);
   }
 }