diff --git a/shell/src/migrate.py b/shell/src/migrate.py
index f889c34c..e4c99cca 100644
--- a/shell/src/migrate.py
+++ b/shell/src/migrate.py
@@ -1753,7 +1753,7 @@ class dcache(object):
 #
 # Tape write pools are usually not big and you can use 1024m. A large file system
 # cache is more useful on such pools.
-dcache.java.memory.heap = 2048m
+dcache.java.memory.heap = 4096m
 
 # The default is 512m, but in particular with xrootd this isn't quite enough. 
 #
@@ -1787,7 +1787,9 @@ dcache.net.wan.port.max = 25000
 # LAN port range for internal pool to pool communication
 dcache.net.lan.port.min = 33115
 dcache.net.lan.port.max = 33145
-
+# use same ports for all protocols (GridFTP, WebDAV, xroot)
+pool.mover.xrootd.port.min = ${dcache.net.wan.port.min}
+pool.mover.xrootd.port.max = ${dcache.net.wan.port.max}
 
 # Allow Let's encrypt certificates that doesn't provide CRLs
 #dcache.authn.hostcert.verify=true
@@ -2130,7 +2132,6 @@ group:atlasde_vokac_vorole     gid:2110
 # ====================================
 # location: /etc/dcache/layouts/layout-{0}.conf
 
-# TODO: cleanup headnode configuration
 [centralDomain]
 dcache.broker.scheme = core
 [centralDomain/zookeeper]
@@ -2222,7 +2223,10 @@ srm.net.port = 8446
                     fs2info[fs_fs] = (spacetokens, space)
                 for fs in sorted(fs2info.keys()):
                     spacetokens, space = fs2info[fs]
-                    f.write("# filesystem {0} size {1} (spacetokens: {2})\n".format(fs, prettySize(space), ', '.join(spacetokens)))
+                    if space != 0:
+                        f.write("# filesystem {0} size {1} (spacetokens: {2})\n".format(fs, prettySize(space), ', '.join(spacetokens)))
+                    else:
+                        f.write("# filesystem {0} (spacetokens: {1})\n".format(fs, ', '.join(spacetokens)))
                 f.write("\n")
                 f.write("""
 [doorsDomain-${host.name}]
@@ -2249,7 +2253,8 @@ ftp.authn.protocol=gsi
                     f.write("pool.name={0}\n".format(dpool))
                     f.write("pool.tags=hostname=${{host.name}} poolgroup={0}\n".format(project))
                     f.write("pool.path={0}/dcache/{1}\n".format(fs, dpool))
-                    f.write("pool.size={0}G\n".format(expected / 1024**3))
+                    # pool.size is zero when DPM DB dump was not done on headnode
+                    #f.write("pool.size={0}G\n".format(expected / 1024**3))
                     #f.write("pool.wait-for-files=${pool.path}/data\n")
                     f.write("\n")