More improvements for #2359