Handle symlinks a bit better