Fixing symlink bugs