Fixed handling of extras directories.