- fix 2 vanilla issues (#8940)