Fixes for directory fragments