Fix dangling symlinks

[merge]