Improvements for #4486