More directory fixes