diff --git a/.gitignore b/.gitignore
index d20dda59790..c3aa78fae53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,9 +90,12 @@ forge-gui/target
 forge-gui/tools/PerSetTrackingResults
 forge-gui/tools/oracleScript.log
 forge-m-android/bin
+forge-m-android/target
 forge-m-base/bin
+forge-m-base/target
 forge-m-desktop/bin
 forge-m-desktop/res
+forge-m-desktop/target
 forge-net/target
 /forge.profile.properties
 /nbactions.xml
diff --git a/forge-m-base/src/forge/Forge.java b/forge-m-base/src/forge/Forge.java
index 04cd5d50ede..51cada6a83b 100644
--- a/forge-m-base/src/forge/Forge.java
+++ b/forge-m-base/src/forge/Forge.java
@@ -86,7 +86,7 @@ public class Forge implements ApplicationListener {
                     }
                 };
                 final CardStorageReader reader = new CardStorageReader(Constants.CARD_DATA_DIR, progressBarBridge, null);
-                magicDb = new StaticData(reader, "res/editions", "res/blockdata");
+                magicDb = new StaticData(reader, Constants.EDITIONS_DIR, Constants.BLOCK_DATA_DIR);
                 
                 bar.setDescription("Opening main window...");
 
diff --git a/forge-m-base/src/forge/screens/match/MatchController.java b/forge-m-base/src/forge/screens/match/MatchController.java
index 7a42b7d9cdc..5d49f6d7f4a 100644
--- a/forge-m-base/src/forge/screens/match/MatchController.java
+++ b/forge-m-base/src/forge/screens/match/MatchController.java
@@ -40,12 +40,12 @@ public class MatchController {
         
         // It's important to run match in a different thread to allow GUI inputs to be invoked from inside game. 
         // Game is set on pause while gui player takes decisions
-        game.getAction().invoke(new Runnable() {
+        /*game.getAction().invoke(new Runnable() {
             @Override
             public void run() {
                 match.startGame(game);
             }
-        });
+        });*/
     }
 
     public final void endCurrentGame() {
diff --git a/forge-m-base/src/forge/utils/Constants.java b/forge-m-base/src/forge/utils/Constants.java
index b8f4ba3efa3..ed23285fa83 100644
--- a/forge-m-base/src/forge/utils/Constants.java
+++ b/forge-m-base/src/forge/utils/Constants.java
@@ -44,6 +44,8 @@ public final class Constants {
     public static final String PRICES_BOOSTER_FILE = _QUEST_DIR + "booster-prices.txt";
     public static final String BAZAAR_FILE         = _QUEST_DIR + "bazaar/index.xml";
     public static final String CARD_DATA_DIR       = _ASSETS_ROOT + "cardsfolder/";
+    public static final String EDITIONS_DIR        = _ASSETS_ROOT + "editions/";
+    public static final String BLOCK_DATA_DIR      = _ASSETS_ROOT + "blockdata/";
     public static final String DECK_CUBE_DIR       = _ASSETS_ROOT + "cube";
     public static final String QUEST_WORLD_DIR     = _QUEST_DIR + "worlds/";
     public static final String QUEST_PRECON_DIR    = _QUEST_DIR + "precons/";