diff --git a/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java b/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java
index db5944c8707..bb8d9066032 100644
--- a/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java
+++ b/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java
@@ -47,7 +47,7 @@ public enum CDeckEditorUI implements CardContainer {
     /** */
     SINGLETON_INSTANCE;
 
-    private ACEditorBase<?, ?> childController;
+    private ACEditorBase<? extends InventoryItem, ? extends DeckBase> childController;
 
     private CDeckEditorUI() {
     }
@@ -87,7 +87,7 @@ public enum CDeckEditorUI implements CardContainer {
      * 
      * @param editor0 &emsp; {@link forge.gui.deckeditor.controllers.ACEditorBase}<?, ?>
      */
-    public void setCurrentEditorController(ACEditorBase<?, ?> editor0) {
+    public void setCurrentEditorController(ACEditorBase<? extends InventoryItem, ? extends DeckBase> editor0) {
         this.childController = editor0;
         updateController();
         if (childController != null) {
@@ -106,13 +106,13 @@ public enum CDeckEditorUI implements CardContainer {
 
     private void moveSelectedCards(EditorTableView<InventoryItem> table, _MoveAction moveAction, int maxQty) {
         List<InventoryItem> items = table.getSelectedCards();
-        
         if (items.isEmpty()) {
             return;
         }
         
         for (InventoryItem item : items) {
-            moveAction.move(item, Math.min(maxQty, table.getCardCount(item)));
+            int toMove = Math.min(maxQty, table.getCardCount(item));
+            moveAction.move(item, toMove);
         }
 
         CStatistics.SINGLETON_INSTANCE.update();
@@ -120,25 +120,26 @@ public enum CDeckEditorUI implements CardContainer {
     }
 
     @SuppressWarnings("unchecked")
-    public void addSelectedCards(boolean addFour) {
+    public void addSelectedCards(int number) {
         moveSelectedCards((EditorTableView<InventoryItem>)childController.getTableCatalog(),
                 new _MoveAction() {
             @Override
             public void move(InventoryItem item, int qty) {
                 childController.addCard(item, qty);
             }
-        }, addFour ? 4 : 1);
+        }, number);
     }
 
     @SuppressWarnings("unchecked")
-    public void removeSelectedCards(boolean removeFour) {
+    public void removeSelectedCards(int number) {
+        
         moveSelectedCards((EditorTableView<InventoryItem>)childController.getTableDeck(),
                 new _MoveAction() {
             @Override
             public void move(InventoryItem item, int qty) {
                 childController.removeCard(item, qty);
             }
-        }, removeFour ? 4 : 1);
+        }, number);
     }
 
     @SuppressWarnings("unchecked")
@@ -160,28 +161,28 @@ public enum CDeckEditorUI implements CardContainer {
         childController.getTableCatalog().getTable().addKeyListener(new KeyAdapter() {
             @Override
             public void keyPressed(final KeyEvent e) {
-                if (e.getKeyChar() == ' ') { addSelectedCards(false); }
+                if (e.getKeyChar() == ' ') { addSelectedCards(1); }
             }
         });
 
         childController.getTableDeck().getTable().addKeyListener(new KeyAdapter() {
             @Override
             public void keyPressed(final KeyEvent e) {
-                if (e.getKeyChar() == ' ') { removeSelectedCards(false); }
+                if (e.getKeyChar() == ' ') { removeSelectedCards(1); }
             }
         });
 
         childController.getTableCatalog().getTable().addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(final MouseEvent e) {
-                if (e.getClickCount() == 2) { addSelectedCards(false); }
+                if (e.getClickCount() == 2) { addSelectedCards(1); }
             }
         });
 
         childController.getTableDeck().getTable().addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(final MouseEvent e) {
-                if (e.getClickCount() == 2) { removeSelectedCards(false); }
+                if (e.getClickCount() == 2) { removeSelectedCards(1); }
             }
         });
 
diff --git a/src/main/java/forge/gui/deckeditor/controllers/CCardCatalog.java b/src/main/java/forge/gui/deckeditor/controllers/CCardCatalog.java
index a39ec236689..13384c0d423 100644
--- a/src/main/java/forge/gui/deckeditor/controllers/CCardCatalog.java
+++ b/src/main/java/forge/gui/deckeditor/controllers/CCardCatalog.java
@@ -86,13 +86,13 @@ public enum CCardCatalog implements ICDoc {
         VCardCatalog.SINGLETON_INSTANCE.getBtnAdd().setCommand(new Command() {
             @Override
             public void execute() {
-                CDeckEditorUI.SINGLETON_INSTANCE.addSelectedCards(false);
+                CDeckEditorUI.SINGLETON_INSTANCE.addSelectedCards(1);
             }
         });
         VCardCatalog.SINGLETON_INSTANCE.getBtnAdd4().setCommand(new Command() {
             @Override
             public void execute() {
-                CDeckEditorUI.SINGLETON_INSTANCE.addSelectedCards(true);
+                CDeckEditorUI.SINGLETON_INSTANCE.addSelectedCards(4);
             }
         });
         
diff --git a/src/main/java/forge/gui/deckeditor/controllers/CCurrentDeck.java b/src/main/java/forge/gui/deckeditor/controllers/CCurrentDeck.java
index 50482b8da3e..49cf779ff4a 100644
--- a/src/main/java/forge/gui/deckeditor/controllers/CCurrentDeck.java
+++ b/src/main/java/forge/gui/deckeditor/controllers/CCurrentDeck.java
@@ -103,12 +103,12 @@ public enum CCurrentDeck implements ICDoc {
 
         ((FLabel) VCurrentDeck.SINGLETON_INSTANCE.getBtnRemove()).setCommand(new Command() {
             @Override  public void execute() {
-                CDeckEditorUI.SINGLETON_INSTANCE.removeSelectedCards(false);
+                CDeckEditorUI.SINGLETON_INSTANCE.removeSelectedCards(1);
             } });
 
         ((FLabel) VCurrentDeck.SINGLETON_INSTANCE.getBtnRemove4()).setCommand(new Command() {
             @Override  public void execute() {
-                CDeckEditorUI.SINGLETON_INSTANCE.removeSelectedCards(true);
+                CDeckEditorUI.SINGLETON_INSTANCE.removeSelectedCards(4);
             }
         });
     }
diff --git a/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java b/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java
index 5b08618b437..fddc817b0ea 100644
--- a/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java
+++ b/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java
@@ -30,6 +30,7 @@ import forge.gui.deckeditor.controllers.ACEditorBase;
 import forge.gui.deckeditor.controllers.CEditorLimited;
 import forge.gui.framework.ICDoc;
 import forge.item.CardPrinted;
+import forge.item.InventoryItem;
 import forge.item.ItemPool;
 import forge.util.IStorage;
 import forge.util.TextUtil;
@@ -222,7 +223,7 @@ public enum CSubmenuSealed implements ICDoc {
 
         Singletons.getModel().getDecks().getSealed().add(sealed);
 
-        final ACEditorBase<?, T> editor = (ACEditorBase<?, T>) new CEditorLimited(
+        final ACEditorBase<? extends InventoryItem, T> editor = (ACEditorBase<? extends InventoryItem, T>) new CEditorLimited(
                 Singletons.getModel().getDecks().getSealed());
 
         CDeckEditorUI.SINGLETON_INSTANCE.setCurrentEditorController(editor);