More dir fixes?