More fixes for #1570