More dir fixes