MDL-31989: Minor fixes