Fixed annotation and assembly call for both archive and symlink