More fixes for #1785