Small fixes for directory.