Bug fixes for cover_then_xyz strategies