Improve "-d" mode.