Better symlink handling