Fixes for #12673