Fix issues with symlinks