#10591 smaller fixes