diff --git a/docker-compose.yml b/docker-compose.yml
index 812b6ca..2d8a8f5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
      - MYSQL_USER=trackmania
      - MYSQL_PASSWORD=
     volumes:
-     - /db-data:/var/lib/mysql
+     - ./db-data:/var/lib/mysql
   pma:
     image: phpmyadmin/phpmyadmin
     container_name: trackmania_phpmyadmin
@@ -50,6 +50,7 @@ services:
      - tmserver
     restart: on-failure
     environment:
+     - SERVER_SA_PASSWORD=
      - DB_HOST=db
      - DB_LOGIN=trackmania
      - DB_LOGIN_PASSWORD=
diff --git a/docker-tmserver/.entrypoint-tmserver.sh.swp b/docker-tmserver/.entrypoint-tmserver.sh.swp
deleted file mode 100644
index c249fc8..0000000
Binary files a/docker-tmserver/.entrypoint-tmserver.sh.swp and /dev/null differ
diff --git a/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/playlist.txt b/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/playlist.txt
index 97627e8..c6d9ff5 100644
--- a/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/playlist.txt
+++ b/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/playlist.txt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <playlist>
 	<gameinfos>
-		<game_mode>0</game_mode>
+		<game_mode>1</game_mode>
 		<chat_time>10000</chat_time>
 		<finishtimeout>1</finishtimeout>
 		<allwarmupduration>0</allwarmupduration>
diff --git a/docker-xaseco/entrypoint-xaseco.sh b/docker-xaseco/entrypoint-xaseco.sh
index 1bda795..230ea0e 100755
--- a/docker-xaseco/entrypoint-xaseco.sh
+++ b/docker-xaseco/entrypoint-xaseco.sh
@@ -16,7 +16,7 @@ fi
 if [[ -z "${MASTERADMIN_LOGIN}" ]]
 then
 	echo "No ingame MasterAdmin was specified."
-	MASTERADMIN_LOGIN=""
+	MASTERADMIN_LOGIN="_placeholder_"
 fi
 if [[ -z "${SERVER_SA_PASSWORD}" ]]
 then
diff --git a/docker-xaseco/xaseco/config.xml b/docker-xaseco/xaseco/config.xml
index e695055..a35c6d0 100644
--- a/docker-xaseco/xaseco/config.xml
+++ b/docker-xaseco/xaseco/config.xml
@@ -6,7 +6,7 @@
       <!-- ipaddress can be specified to guard each login against       -->
       <!-- unauthorized use of admin commands from other IP addresses   -->
 <!-- format:
-      <tmlogin>--$MASTERADMIN_LOGIN--</tmlogin> <ipaddress></ipaddress>
+      <tmlogin>_placeholder_</tmlogin> <ipaddress></ipaddress>
 -->
     </masteradmins>
 
diff --git a/docker-xaseco/xaseco/localdb/aseco.sql b/docker-xaseco/xaseco/localdb/aseco.sql
index 3b05520..20906e9 100644
--- a/docker-xaseco/xaseco/localdb/aseco.sql
+++ b/docker-xaseco/xaseco/localdb/aseco.sql
@@ -9,6 +9,7 @@
 CREATE TABLE IF NOT EXISTS `challenges` (
   `Id` mediumint(9) NOT NULL auto_increment,
   `Uid` varchar(27) NOT NULL default '',
+  `Date` datetime NOT NULL default '1970-01-01 00:00:00',
   `Name` varchar(100) NOT NULL default '',
   `Author` varchar(30) NOT NULL default '',
   `Environment` varchar(10) NOT NULL default '',