More fixes for #1811.