Fixes for directory setup