diff --git a/source/src/client.cpp b/source/src/client.cpp
index 0f75dadb..b604591b 100644
--- a/source/src/client.cpp
+++ b/source/src/client.cpp
@@ -459,3 +459,6 @@ void getmap()
 
 COMMAND(sendmap, ARG_1STR);
 COMMAND(getmap, ARG_NONE);
+COMMAND(clearsecuremaps, ARG_NONE);
+COMMAND(securemap, ARG_1STR);
+
diff --git a/source/src/main.cpp b/source/src/main.cpp
index 359ff117..9d797fc2 100644
--- a/source/src/main.cpp
+++ b/source/src/main.cpp
@@ -288,7 +288,7 @@ int main(int argc, char **argv)
     execfile("config/servers.cfg");
     persistidents = true;
 
-    gzFile f = gzopen("config/maps.dat", "rb9");
+    gzFile f = gzopen("packages/misc/maps.dat", "rb9");
     if(f)
     {
         int n;
diff --git a/source/src/worldio.cpp b/source/src/worldio.cpp
index faa55491..2b11b6b8 100644
--- a/source/src/worldio.cpp
+++ b/source/src/worldio.cpp
@@ -127,11 +127,11 @@ uchar *readmap(char *mname, int *msize)
 
 void save_world(char *mname)
 {
+    if(!*mname) mname = getclientmap();
     extern bool securemapcheck(char *map);
     if(securemapcheck(mname)) return;
     voptimize();
     toptimize();
-    if(!*mname) mname = getclientmap();
     setnames(mname);
     backup(cgzname, bakname);
     gzFile f = gzopen(cgzname, "wb9");