more fixes for #9513

More fixes for #9513