Further fixes to #12265