Improvements to #1720