Fixes for #15907