diff --git a/Mage.Client/src/main/assembly/distribution.xml b/Mage.Client/src/main/assembly/distribution.xml
index 39c50ec1c99..5f8c9aef150 100644
--- a/Mage.Client/src/main/assembly/distribution.xml
+++ b/Mage.Client/src/main/assembly/distribution.xml
@@ -4,6 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
                       http://maven.apache.org/xsd/assembly-1.1.1.xsd">
     <includeBaseDirectory>false</includeBaseDirectory>
+    <id>mage-client</id>
     <formats>
         <format>zip</format>
     </formats>
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
index f7420e26135..0b910c5b5cc 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
@@ -169,8 +169,6 @@ public class DeckEditorPanel extends javax.swing.JPanel {
                 if (deck != null) {
                     this.cardSelector.loadSideboard(new ArrayList<>(deck.getSideboard()), this.bigCard);
                 }
-                // TODO: take from preferences
-                this.cardSelector.switchToGrid();
 
                 this.btnExit.setVisible(false);
                 this.btnImport.setVisible(false);
diff --git a/Mage.Server/src/main/assembly/distribution.xml b/Mage.Server/src/main/assembly/distribution.xml
index cf324aec069..20bab51d574 100644
--- a/Mage.Server/src/main/assembly/distribution.xml
+++ b/Mage.Server/src/main/assembly/distribution.xml
@@ -4,6 +4,7 @@
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
                       http://maven.apache.org/xsd/assembly-1.1.1.xsd">
     <includeBaseDirectory>false</includeBaseDirectory>
+    <id>mage-server</id>
     <formats>
         <format>zip</format>
     </formats>
diff --git a/Utils/gen-simple-cards-by-set.pl b/Utils/gen-simple-cards-by-set.pl
index f0dc6779ae7..ef72241097c 100755
--- a/Utils/gen-simple-cards-by-set.pl
+++ b/Utils/gen-simple-cards-by-set.pl
@@ -46,13 +46,13 @@ if(!exists $knownSets{$setName}) {
 my $packageName = $knownSets{$setName};
 
 $setName =~ s/"/\\"/g;
-system("gen-existing-cards-by-set.pl \"$setName\"");
+system("./gen-existing-cards-by-set.pl \"$setName\"");
 
 # Generate missing simple cards
 print "Simple cards generated: \n";
 foreach my $cardName (@setCards) {
     my $fileName = "../Mage.Sets/src/mage/sets/" . $packageName . "/" . toCamelCase(${$cardName}[0]) . ".java";
     if(!-e $fileName) {
-        system("gen-card.pl \"${$cardName}[0]\" true");
+        system("./gen-card.pl \"${$cardName}[0]\" true");
     }
 }
\ No newline at end of file