#12912: Further fixes

