A few more symlink-related fixes. Fix a bug triggered by cp