Directory path fixes