diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java
index a3cc30f07fc..0cfca9618d2 100644
--- a/forge-ai/src/main/java/forge/ai/AiController.java
+++ b/forge-ai/src/main/java/forge/ai/AiController.java
@@ -1581,7 +1581,7 @@ public class AiController {
             return spellAbility.isLandAbility() || (spellAbility.getHostCard() != null && ComputerUtilCard.isCardRemAIDeck(spellAbility.getHostCard()));
         });
         //removed skipped SA
-        skipped = Lists.newArrayList(Iterables.filter(saList, SpellAbility::isSkip));
+        skipped = saList.stream().filter(SpellAbility::isSkip).collect(Collectors.toList());
         if (!skipped.isEmpty())
             saList.removeAll(skipped);
         //update LivingEndPlayer
diff --git a/forge-game/src/main/java/forge/game/ability/effects/DiscoverEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DiscoverEffect.java
index 31f38e3dd13..af2c60d4882 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DiscoverEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DiscoverEffect.java
@@ -92,7 +92,7 @@ public class DiscoverEffect extends SpellAbilityEffect {
                     List<SpellAbility> sas = AbilityUtils.getBasicSpellsFromPlayEffect(found, p);
 
                     // filter out land abilities due to MDFC or similar
-                    sas.removeIf(sp -> sp.isLandAbility());
+                    sas.removeIf(SpellAbility::isLandAbility);
                     // the spell must also have a mana value equal to or less than the discover number
                     sas.removeIf(sp -> sp.getPayCosts().getTotalMana().getCMC() > num);
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/UnlockDoorEffect.java b/forge-game/src/main/java/forge/game/ability/effects/UnlockDoorEffect.java
index 52be9017666..9df8766e998 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/UnlockDoorEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/UnlockDoorEffect.java
@@ -52,7 +52,7 @@ public class UnlockDoorEffect extends SpellAbilityEffect {
                 c.unlockRoom(activator, sa.getCardStateName());
                 break;
             case "Unlock":
-                List<CardState> states = c.getLockedRooms().stream().map(stateName -> c.getState(stateName)).collect(Collectors.toList());
+                List<CardState> states = c.getLockedRooms().stream().map(c::getState).collect(Collectors.toList());
 
                 // need to choose Room Name
                 CardState chosen = activator.getController().chooseSingleCardState(sa, states, "Choose Room to unlock", params);
@@ -65,7 +65,7 @@ public class UnlockDoorEffect extends SpellAbilityEffect {
                 switch (c.getLockedRooms().size()) {
                 case 0:
                     // no locked, all unlocked, can only lock door
-                    List<CardState> unlockStates = c.getUnlockedRooms().stream().map(stateName -> c.getState(stateName)).collect(Collectors.toList());
+                    List<CardState> unlockStates = c.getUnlockedRooms().stream().map(c::getState).collect(Collectors.toList());
                     CardState chosenUnlock = activator.getController().chooseSingleCardState(sa, unlockStates, "Choose Room to lock", params);
                     if (chosenUnlock == null) {
                         continue;
@@ -88,7 +88,7 @@ public class UnlockDoorEffect extends SpellAbilityEffect {
                     }
                     break;
                 case 2:
-                    List<CardState> lockStates = c.getLockedRooms().stream().map(stateName -> c.getState(stateName)).collect(Collectors.toList());
+                    List<CardState> lockStates = c.getLockedRooms().stream().map(c::getState).collect(Collectors.toList());
 
                     // need to choose Room Name
                     CardState chosenLock = activator.getController().chooseSingleCardState(sa, lockStates, "Choose Room to unlock", params);
diff --git a/forge-gui-android/src/com/badlogic/gdx/backends/android/AndroidApplication.java b/forge-gui-android/src/com/badlogic/gdx/backends/android/AndroidApplication.java
index 75b84958fdd..3f08d5cd83b 100644
--- a/forge-gui-android/src/com/badlogic/gdx/backends/android/AndroidApplication.java
+++ b/forge-gui-android/src/com/badlogic/gdx/backends/android/AndroidApplication.java
@@ -290,12 +290,7 @@ public class AndroidApplication extends Activity implements AndroidApplicationBa
 		}
 		super.onResume();
 		keyboardHeightProvider.setKeyboardHeightObserver((DefaultAndroidInput)Gdx.input);
-		((AndroidGraphics)getGraphics()).getView().post(new Runnable() {
-			@Override
-			public void run () {
-				keyboardHeightProvider.start();
-			}
-		});
+		((AndroidGraphics)getGraphics()).getView().post(() -> keyboardHeightProvider.start());
 	}
 
 	@Override
@@ -382,12 +377,7 @@ public class AndroidApplication extends Activity implements AndroidApplicationBa
 
 	@Override
 	public void exit () {
-		handler.post(new Runnable() {
-			@Override
-			public void run () {
-				AndroidApplication.this.finish();
-			}
-		});
+		handler.post(AndroidApplication.this::finish);
 	}
 
 	@Override