Improve symlink fix