diff --git a/forge-game/src/main/java/forge/game/mana/ManaPool.java b/forge-game/src/main/java/forge/game/mana/ManaPool.java
index f6e8e40edaf..31a52e30bb5 100644
--- a/forge-game/src/main/java/forge/game/mana/ManaPool.java
+++ b/forge-game/src/main/java/forge/game/mana/ManaPool.java
@@ -350,11 +350,15 @@ public class ManaPool extends ManaConversionMatrix implements Iterable<Mana> {
     }
 
     public boolean canPayForShardWithColor(ManaCostShard shard, byte color) {
+        if (shard.isOfKind(ManaAtom.COLORLESS) && color == ManaAtom.GENERIC) {
+            return false; // FIXME: testing Colorless against Generic is a recipe for disaster, but probably there should be a better fix.
+        }
+
         // TODO Debug this for Paying Gonti,
         byte line = getPossibleColorUses(color);
 
         for(byte outColor : ManaAtom.MANATYPES) {
-            if ((line & outColor) != 0 && shard.canBePaidWithManaOfColor(color)) {
+            if ((line & outColor) != 0 && shard.canBePaidWithManaOfColor(outColor)) {
                 return true;
             }
         }
diff --git a/forge-gui/src/main/java/forge/achievement/AltWinAchievements.java b/forge-gui/src/main/java/forge/achievement/AltWinAchievements.java
index f78ec584544..02da7141241 100644
--- a/forge-gui/src/main/java/forge/achievement/AltWinAchievements.java
+++ b/forge-gui/src/main/java/forge/achievement/AltWinAchievements.java
@@ -42,6 +42,9 @@ public class AltWinAchievements extends AchievementCollection {
             }
 
             Achievement achievement = achievements.get(altWinCondition);
+            if (achievement == null) {
+                achievement = achievements.get("Emblem - " + altWinCondition); // indirectly winning through an emblem
+            }
             if (achievement != null) {
                 achievement.update(player);
                 save();