[#49746633] Minor fixes