more directory issue fixes.