usability improvements for #1237