diff --git a/res/catalog-e3a.xml b/res/catalog-e3a.xml
index 8eb4603a3..661a6cedb 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="../../res/" />
+        rewritePrefix="../../server/res/" />
 </catalog>
diff --git a/res/catalog-eressea.xml b/res/catalog-eressea.xml
index 8eb4603a3..661a6cedb 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="../../res/" />
+        rewritePrefix="../../server/res/" />
 </catalog>
diff --git a/src/main.c b/src/main.c
index 49f8503fb..20902ea21 100644
--- a/src/main.c
+++ b/src/main.c
@@ -12,8 +12,9 @@
 #include <locale.h>
 #include <wctype.h>
 
-static const char * luafile = "init.lua";
+static const char * luafile = "setup.lua";
 static const char * entry_point = NULL;
+static const char * inifile = "eressea.ini";
 static int memdebug = 0;
 
 static void parse_config(const char * filename)
@@ -231,7 +232,7 @@ int main(int argc, char ** argv)
 
   log_open("eressea.log");
   locale_init();
-  parse_config("eressea.ini");
+  parse_config(inifile);
 
   err = parse_args(argc, argv);
   if (err) {