[#73203578] last few tweaks