Fix rebuilding of args/files/URLs/directories