Support xfer_dirs properly