More fixes for #894