more directory fixes