fix short_path and bin_annot tags.g