Improvements for #80732