Few more tweaks

[#55278456]