- Fix a handful of vanilla bugs (#8187)