Some more directory fixes