diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java
index 3af47ebee..55714cb00 100644
--- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java
@@ -120,7 +120,7 @@ class AndroidTaskScheduler implements TaskScheduler, Service, AlarmListener {
 				LOG.info("Alarm");
 				rescheduleAlarm();
 				runDueTasks();
-			} else {
+			} else if (LOG.isLoggable(INFO)) {
 				LOG.info("Ignoring alarm with PID " + extraPid
 						+ ", current PID is " + currentPid);
 			}
@@ -154,6 +154,7 @@ class AndroidTaskScheduler implements TaskScheduler, Service, AlarmListener {
 	}
 
 	private void rescheduleAlarm() {
+		// If SDK_INT < 23 the alarm repeats automatically
 		if (SDK_INT >= 23) scheduleIdleAlarm();
 	}
 
diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockManagerImpl.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockManagerImpl.java
index 4ed400eee..bf80c5fc0 100644
--- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockManagerImpl.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockManagerImpl.java
@@ -13,7 +13,6 @@ import org.briarproject.bramble.api.system.AndroidWakeLockManager;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 
-import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
 import static android.content.Context.POWER_SERVICE;
@@ -22,7 +21,6 @@ import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 
-@Immutable
 @NotNullByDefault
 class AndroidWakeLockManagerImpl implements AndroidWakeLockManager {