diff --git a/src/main/java/forge/card/mana/ManaCostBeingPaid.java b/src/main/java/forge/card/mana/ManaCostBeingPaid.java
index a8dcc7a2ca8..5721954cd06 100644
--- a/src/main/java/forge/card/mana/ManaCostBeingPaid.java
+++ b/src/main/java/forge/card/mana/ManaCostBeingPaid.java
@@ -235,7 +235,7 @@ public class ManaCostBeingPaid {
      * @return a boolean.
      */
     public final String payMultipleMana(String mana) {
-        List<String> unused = new ArrayList<>(4);
+        List<String> unused = new ArrayList<String>(4);
         for (String manaPart : TextUtil.split(mana, ' ')) {
             if (StringUtils.isNumeric(manaPart)) {
                 for(int i = Integer.parseInt(manaPart); i > 0; i--) {
diff --git a/src/main/java/forge/game/GameAction.java b/src/main/java/forge/game/GameAction.java
index 0bbb2e4a46a..f5e54724e24 100644
--- a/src/main/java/forge/game/GameAction.java
+++ b/src/main/java/forge/game/GameAction.java
@@ -871,19 +871,11 @@ public class GameAction {
         final Comparator<StaticAbility> comp = new Comparator<StaticAbility>() {
             @Override
             public int compare(final StaticAbility a, final StaticAbility b) {
-                if (a.getLayer() > b.getLayer()) {
-                    return 1;
-                }
-                if (a.getLayer() < b.getLayer()) {
-                    return -1;
-                }
-                if (a.getHostCard().getTimestamp() > b.getHostCard().getTimestamp()) {
-                    return 1;
-                }
-                if (a.getHostCard().getTimestamp() < b.getHostCard().getTimestamp()) {
-                    return -1;
-                }
-                return 0;
+                int layerDelta = a.getLayer() - b.getLayer();
+                if( layerDelta != 0) return layerDelta;
+
+                long tsDelta = a.getHostCard().getTimestamp() - b.getHostCard().getTimestamp();
+                return tsDelta == 0 ? 0 : tsDelta > 0 ? 1 : -1;
             }
         };
         Collections.sort(staticAbilities, comp);
diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java
index 9d078583d95..74d2df10957 100644
--- a/src/main/java/forge/game/player/Player.java
+++ b/src/main/java/forge/game/player/Player.java
@@ -1061,16 +1061,6 @@ public class Player extends GameEntity implements Comparable<Player> {
         return this.keywords;
     }
 
-    /**
-     * Sets the keywords.
-     * 
-     * @param keywords
-     *            the new keywords
-     */
-    public final void setKeywords(final ArrayList<String> keywords) {
-        this.keywords = keywords;
-    }
-
     /**
      * Adds the keyword.
      *