More fixes for #1701