Better handling of skipping directories.