More fixes for #1572