More directory fixes.