diff --git a/game-e2/setup.lua b/game-e2/setup.lua
index a32fa437f..d9dea3541 100644
--- a/game-e2/setup.lua
+++ b/game-e2/setup.lua
@@ -2,7 +2,7 @@ local srcpath = config.source_dir
 local respath = srcpath .. '/res'
 local paths = {
   'scripts/?.lua',
-  'eressea/scripts/?.lua',
+  'core/scripts/?.lua',
   'lunit/?.lua'
 }
 
diff --git a/game-e3/setup.lua b/game-e3/setup.lua
index 8fb4074e2..e93f64a48 100644
--- a/game-e3/setup.lua
+++ b/game-e3/setup.lua
@@ -2,7 +2,7 @@ local srcpath = config.source_dir
 local respath = srcpath .. '/res'
 local paths = {
   'scripts/?.lua',
-  'eressea/scripts/?.lua',
+  'core/scripts/?.lua',
   'lunit/?.lua'
 }
 
diff --git a/res/catalog-e3a.xml b/res/catalog-e3a.xml
index 77e0f1210..96dbf8d9d 100644
--- a/res/catalog-e3a.xml
+++ b/res/catalog-e3a.xml
@@ -6,5 +6,5 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
     <rewriteURI
         uriStartString="eressea:///core/"
-        rewritePrefix="../eressea/res/" />
+        rewritePrefix="../core/res/" />
 </catalog>
diff --git a/res/catalog-eressea.xml b/res/catalog-eressea.xml
index 77e0f1210..96dbf8d9d 100644
--- a/res/catalog-eressea.xml
+++ b/res/catalog-eressea.xml
@@ -6,5 +6,5 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
     <rewriteURI
         uriStartString="eressea:///core/"
-        rewritePrefix="../eressea/res/" />
+        rewritePrefix="../core/res/" />
 </catalog>
diff --git a/src/main.c b/src/main.c
index 2d07ec4b4..289196769 100644
--- a/src/main.c
+++ b/src/main.c
@@ -84,7 +84,7 @@ static int get_arg(int argc, char **argv, size_t len, int index, const char **re
     return index;
   }
   if (index+1 < argc) {
-    *result = argv[index];
+    *result = argv[index+1];
     return index+1;
   }
   *result = def;