Resolve directory linking problems