more dir fixes