Dirty fix for directories.
Minor cleanup.